From d4fca49a4b70fe60c730d7e32e2035153a91fcc5 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期一, 31 五月 2021 17:13:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue | 91 ++-
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue | 185 ++++--
src/components/base-page/enterprise-emergency/events-reported/ReportLocation.js | 17
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue | 414 +++++++---------
src/views/MapTemplate.vue | 145 ++---
src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue | 57 +-
src/components/panel/topicSearch/SewersSearch.vue | 161 +++---
src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue | 427 ++++++++--------
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 2
9 files changed, 767 insertions(+), 732 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue b/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue
index b0d39c3..9f35490 100644
--- a/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue
+++ b/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue
@@ -1,28 +1,25 @@
<template>
- <el-dialog :visible.sync="isShow" class="effect-vol-calc" title="鍒嗘瀽" :modal="false" v-dialog-drag
- :before-close="handleClose">
+ <div>
+ <el-dialog :visible.sync="isShow" class="effect-vol-calc" title="鍒嗘瀽" :modal="false" v-dialog-drag
+ :before-close="handleClose">
+ <!--<!– 鍩烘湰淇℃伅–>-->
+ <!-- <event-base-info>-->
-<!--<!– 鍩烘湰淇℃伅–>-->
-<!-- <event-base-info>-->
-
-<!-- </event-base-info>-->
-<!-- 寤鸿澶勭疆-->
- <disposal-proposed>
-
- </disposal-proposed>
- <!-- 鏈夋晥瀹圭Н璁＄畻-->
- <div class="footer">
- <el-button type="primary" size="mini" @click="toggleShowCalc">浜嬫晠姘磋绠�</el-button>
- <el-button type="primary" size="mini" @click="toggleShowResInfo">鍛ㄨ竟璧勬簮</el-button>
- <el-button type="primary" size="mini" @click="toggleShowReportDoc">鐢熸垚鎶ュ憡</el-button>
-<!-- <el-button type="primary" size="mini" @click="close">杩斿洖</el-button>-->
- </div>
-
- <effective-volume-calc ref="effectVolCalc"></effective-volume-calc>
- <event-report-doc ref="eventReportDoc" :reportItemCon="reportItemCon"> </event-report-doc>
- <res-info ref="resInfo"></res-info>
- </el-dialog>
-
+ <!-- </event-base-info>-->
+ <!-- 寤鸿澶勭疆-->
+ <disposal-proposed></disposal-proposed>
+ <!-- 鏈夋晥瀹圭Н璁＄畻-->
+ <div class="footer">
+ <el-button type="primary" size="mini" @click="toggleShowCalc">浜嬫晠姘磋绠�</el-button>
+ <el-button type="primary" size="mini" @click="toggleShowResInfo">鍛ㄨ竟璧勬簮</el-button>
+ <el-button type="primary" size="mini" @click="toggleShowReportDoc">鐢熸垚鎶ュ憡</el-button>
+ <!-- <el-button type="primary" size="mini" @click="close">杩斿洖</el-button>-->
+ </div>
+ <effective-volume-calc ref="effectVolCalc"></effective-volume-calc>
+ <event-report-doc ref="eventReportDoc" :reportItemCon="reportItemCon"></event-report-doc>
+ <res-info ref="resInfo"></res-info>
+ </el-dialog>
+ </div>
</template>
<script>
@@ -32,9 +29,15 @@
import EventReportDoc from '@components/base-page/enterprise-emergency/event-handling/EventReportDoc'
import ResInfo from '@components/base-page/enterprise-emergency/event-handling/ResInfo'
import eventBus from '../../../../eventBus'
+
export default {
name: 'EventHandling',
- components: { ResInfo, EventReportDoc, DisposalProposed, EffectiveVolumeCalc },
+ components: {
+ ResInfo,
+ EventReportDoc,
+ DisposalProposed,
+ EffectiveVolumeCalc
+ },
data () {
return {
isShow: false,
@@ -65,7 +68,9 @@
report () {
console.log('鐢熸垚鎶ュ憡')
},
- close () { console.log('杩斿洖') },
+ close () {
+ console.log('杩斿洖')
+ },
handleClose () {
this.isShow = false
@@ -76,7 +81,7 @@
</script>
<style lang="less" scoped>
-.footer{
+.footer {
text-align: right;
margin: 15px;
}
diff --git a/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue b/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
index 71adc84..b52f801 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
@@ -1,147 +1,147 @@
<template>
- <div class="event-report">
- <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" size="small" @click="submitForm('ruleForm')">纭</el-button>
- <el-button size="small" @click="resetForm('ruleForm')">鍙栨秷</el-button>
- </el-form-item>
- </el-form>
- <el-dialog
- custom-class="event-report-dialog"
- title="浜嬪彂浣嶇疆瀹氫綅"
- :visible.sync="dialogLocation"
- :append-to-body="true"
- :modal="false"
- v-dialogDrag
- >
- <ReportLocation></ReportLocation>
- </el-dialog>
- </div>
+ <div class="event-report">
+ <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" size="small" @click="submitForm('ruleForm')">纭</el-button>
+ <el-button size="small" @click="resetForm('ruleForm')">鍙栨秷</el-button>
+ </el-form-item>
+ </el-form>
+ <el-dialog
+ custom-class="event-report-dialog"
+ title="浜嬪彂浣嶇疆瀹氫綅"
+ :visible.sync="dialogLocation"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDrag
+ >
+ <ReportLocation></ReportLocation>
+ </el-dialog>
+ </div>
</template>
<!-- :rules="rules"-->
<!-- :show-close="false"-->
@@ -376,90 +376,85 @@
<style lang="less" scoped>
- /*/deep/ .el-dialog .el-dialog--center {*/
- /* margin-top: 1rem !important;*/
- /* margin-left: 6.4rem !important;*/
- /*}*/
+/deep/ .event-report-dialog {
+ left: 5rem;
+ top: 1rem;
+ margin-top: 2rem;
+ margin-left: 2rem;
+}
- /deep/ .event-report-dialog {
- left: 5rem;
- top: 1rem;
- margin-top: 2rem;
- margin-left: 2rem;
- }
+/deep/ .el-dialog {
+ left: 5rem;
+ top: 1rem;
+ width: 3.087834rem;
+}
- /deep/ .el-dialog {
- left: 5rem;
- top: 1rem;
- width: 3.087834rem;
- }
+.event-report {
+ margin: 0 5px !important;
+}
- .event-report {
- margin: 0 5px !important;
- }
+.way-to {
+ /deep/ .el-form-item__content {
+ display: flex;
+ }
+}
- .way-to {
- /deep/ .el-form-item__content {
- display: flex;
- }
- }
+/deep/ .el-form-item {
+ margin: 2px 0 !important;
+ color: #00fff6 !important;
+}
- /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-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-checkbox__label {
- color: #00fff6 !important;
- }
+/deep/ .el-icon-time:before {
+ content: " ";
+}
- /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/ 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.is-disabled .el-input__inner {
- color: #C0C4CC;
- font-size: 0.01rem;
- border-radius: 4px;
- background: @background-color;
- border-color: @color;
- }
+/deep/ .el-input__inner {
+ height: 0.2rem !important;
+ border-radius: 5px;
+ background: rgba(0, 16, 30, 0.5);
+}
- /deep/ .el-input__inner {
- height: 0.2rem !important;
- border-radius: 5px;
- background: rgba(0, 16, 30, 0.5);
- }
+/deep/ .el-form-item__label {
+ color: @color;
+}
- /deep/ .el-form-item__label {
- color: @color;
- }
+/deep/ .el-radio__label {
+ color: @color;
+}
- /deep/ .el-radio__label {
- color: @color;
- }
-
- .confirmCancel {
- text-align: right;
- margin: 0.071234rem !important;
- }
+.confirmCancel {
+ text-align: right;
+ margin: 0.071234rem !important;
+}
</style>
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocation.js b/src/components/base-page/enterprise-emergency/events-reported/ReportLocation.js
new file mode 100644
index 0000000..d4ddde0
--- /dev/null
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocation.js
@@ -0,0 +1,17 @@
+// 鍏叡鏂规硶 涓婃姤鏁版嵁 鍒版暟鎹簱涓�
+export function publicLocationStore (data) {
+ // const data = {
+ // ID: '',
+ // EventID: '',
+ // EventPipeline: '',
+ // EventPipeSeg: '',
+ // EventAffType: '',
+ // EventAffCode: '',
+ // EventAffPointNum: '',
+ // EventPosX: '',
+ // EventPosY: '',
+ // AcquisitionPeople: '',
+ // AcquisitionDate: ''
+ // }
+ console.log(data)
+}
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
index 145b040..0d4f60e 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
@@ -1,44 +1,45 @@
<template>
- <div class="location-lon-and-lat">
- <el-form :model="lonlatpos" label-width="60px">
- <el-row class="pipe-line-search">
- <el-col :span="12">
- <el-form-item label="缁忓害:">
- <el-input v-model="lonlatpos.longPos"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="绾害:">
- <el-input v-model="lonlatpos.latPos"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <el-row>
- <el-col :span="12" style="text-align: center;margin: 5px 0">
- <el-button type="primary" size="small" @click="mapPoints">绮剧‘瀹氫綅</el-button>
- </el-col>
- <el-col :span="12" style="text-align: center;margin: 5px 0">
- <el-button type="primary" size="small" @click="dataPoints">浣嶇疆鎷惧彇</el-button>
- </el-col>
- </el-row>
- <el-row style="text-align: right;margin: 5px">
- <el-button type="primary" @click="confirm" size="small">纭</el-button>
- </el-row>
- </div>
+ <div class="location-lon-and-lat">
+ <el-form :model="positionLocationForm" label-width="60px">
+ <el-row class="pipe-line-search">
+ <el-col :span="12">
+ <el-form-item label="缁忓害:">
+ <el-input v-model="positionLocationForm.longPos"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="绾害:">
+ <el-input v-model="positionLocationForm.latPos"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <el-row>
+ <el-col :span="12" style="text-align: center;margin: 5px 0">
+ <el-button type="primary" size="small" @click="mapPoints">绮剧‘瀹氫綅</el-button>
+ </el-col>
+ <el-col :span="12" style="text-align: center;margin: 5px 0">
+ <el-button type="primary" size="small" @click="dataPoints">浣嶇疆鎷惧彇</el-button>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: right;margin: 5px">
+ <el-button type="primary" @click="confirm" size="small">纭</el-button>
+ </el-row>
+ </div>
</template>
<script>
import { pulseEffect } from '../../../../utils/utils'
import iconUrl from '../../../../../public/assets/images/map/marker-icon.png'
import eventBus from '../../../../eventBus'
+import { publicLocationStore } from './ReportLocation'
export default {
name: 'ReportLocationPoint',
data () {
return {
// 缁忕含搴﹀畾浣�
- lonlatpos: {
+ positionLocationForm: {
longPos: '',
latPos: ''
},
@@ -50,8 +51,8 @@
// 绮剧‘瀹氫綅
mapPoints () {
window.map.on('click', (e) => {
- this.lonlatpos.longPos = parseFloat(e.latlng.lng).toFixed(8)
- this.lonlatpos.latPos = parseFloat(e.latlng.lat).toFixed(8)
+ this.positionLocationForm.longPos = parseFloat(e.latlng.lng).toFixed(8)
+ this.positionLocationForm.latPos = parseFloat(e.latlng.lat).toFixed(8)
const as = [e.latlng.lat, e.latlng.lng]
// console.log(as)
window.map.setView(as, 17)
@@ -63,17 +64,17 @@
iconAnchor: [13, 20]
})
})
+ // 娣诲姞鐐规暟鎹�
window.map.addLayer(this.marker)
this.layersGroupArrList.push(this.marker)
+ // 浜嬩欢缁撴潫 鍏抽棴鐐瑰嚮浜嬩欢
window.map.off('click')
- // this.lonlatpos.latPos = ''
- // this.lonlatpos.longPos = ''
})
},
// 閫氳繃鏁版嵁瀹氫綅
dataPoints () {
- if (this.lonlatpos.latPos !== '' && this.lonlatpos.longPos !== '') {
- const as = [this.lonlatpos.latPos, this.lonlatpos.longPos]
+ if (this.positionLocationForm.latPos !== '' && this.positionLocationForm.longPos !== '') {
+ const as = [this.positionLocationForm.latPos, this.positionLocationForm.longPos]
window.map.setView(as, 17)
pulseEffect(as)
this.marker = window.L.marker(as, {
@@ -91,14 +92,32 @@
},
// 鐐瑰嚮纭鎸夐挳浜嬩欢
confirm () {
+ // 寰幆鏁版嵁 娓呴櫎 鍥惧眰娣诲姞鐨勭偣鏁版嵁
for (let i = 0; i < this.layersGroupArrList.length; i++) {
window.map.removeLayer(this.layersGroupArrList[i])
}
window.mapManager.clearHighlight()
// window.map.removeLayer(this.marker)
eventBus.$emit('location-setChange', true)
- this.lonlatpos.longPos = ''
- this.lonlatpos.latPos = ''
+ // 浜嬩欢涓婃姤 浣嶇疆淇℃伅 瀛樺偍鏁版嵁搴�
+ const data = {
+ ID: '',
+ EventID: '',
+ EventPipeline: '',
+ EventPipeSeg: '',
+ EventAffType: '',
+ EventAffCode: '',
+ EventAffPointNum: '',
+ EventPosX: this.positionLocationForm.longPos,
+ EventPosY: this.positionLocationForm.latPos,
+ AcquisitionPeople: '',
+ AcquisitionDate: ''
+ }
+ // 閫氳繃鏂规硶 瀛樺偍鏁版嵁 杩涜 鏁版嵁搴撳瓨鍌ㄦ暟鎹�
+ publicLocationStore(data)
+ // 纭畾鐐规暟鎹� 浣嶇疆淇℃伅 杩涜鏁版嵁 鐨勭疆绌�
+ this.positionLocationForm.longPos = ''
+ this.positionLocationForm.latPos = ''
}
}
}
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
index d25e3f2..ff69e83 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
@@ -2,7 +2,7 @@
<div class="click-location">
<el-row>
<!-- clearable-->
- <el-input type="text" v-model="clickLocation" @change="focusLocation">
+ <el-input type="text" v-model="clickLocation" @change="focusLocation" style="display:flex;align-items: center">
<el-button slot="suffix" type="text" @click="focusLocation">
<img src="../../../../../public/assets/images/map/emergency/search.png" alt="">
</el-button>
@@ -10,29 +10,6 @@
</el-row>
<!-- <el-scrollbar style="height:250.34px">-->
<el-row v-for="(item,index) in searchList.slice((currentPage-1)*pageSize,currentPage*pageSize)" :key="index"
- style="display: flex;align-items: center;margin: 0.1343rem 15px;text-align: left"
- class="environmental-risk-list">
-<!-- <div v-if="item.resultType === 1">-->
- <el-col :span="4">
- <img src="../../../../../public/assets/images/map/marker-icon.png" alt="" class="state"
- style="background: none;margin: 0 15px">
- </el-col>
- <el-col :span="12">
- <div class=search-list>
- <!-- <h4 :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛�<h3 style="display: inline-block">{{ item.name }}</h3></h4>-->
- <h3 style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden" :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛歿{ item.name }}</h3>
- <p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">鍦板潃锛�<span>{{ item.address }}</span>
- <p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">鐢佃瘽锛�<span>{{ item.phone }}</span></p>
- </div>
- </el-col>
- <el-col :span="8" style="text-align: right">
- <el-button type="primary" size="mini" icon="el-icon-position" @click="locationMapClick(item,index)">
- 瀹氫綅
- </el-button>
- </el-col>
-<!-- </div>-->
- </el-row>
- <el-row v-for="(item,index) in searchListStatistics.slice((currentPage-1)*pageSize,currentPage*pageSize)" :key="index"
style="display: flex;align-items: center;margin: 0.1343rem 15px;text-align: left"
class="environmental-risk-list">
<!-- <div v-if="item.resultType === 1">-->
@@ -43,13 +20,38 @@
<el-col :span="12">
<div class=search-list>
<!-- <h4 :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛�<h3 style="display: inline-block">{{ item.name }}</h3></h4>-->
- <h3 :class="activeNum===index?'hover':''" @click="handleLocation(index)" >鍚嶇О锛歿{ item.name }}</h3>
+ <h3 style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden"
+ :class="activeNum===index?'hover':''" @click="locationMapClick(1, item, index)">鍚嶇О锛歿{ item.name }}</h3>
<p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">鍦板潃锛�<span>{{ item.address }}</span>
- <p>鐢佃瘽锛�<span>{{ item.phone }}</span></p>
+ <p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">鐢佃瘽锛�<span>{{ item.phone }}</span></p>
</div>
</el-col>
<el-col :span="8" style="text-align: right">
- <el-button type="primary" size="mini" icon="el-icon-position" @click="locationMapClick(item,index)">
+ <el-button type="primary" size="mini" icon="el-icon-position" @click="locationMapClick(1,item,index)">
+ 瀹氫綅
+ </el-button>
+ </el-col>
+ <!-- </div>-->
+ </el-row>
+ <el-row v-for="(item,index) in searchListStatistics.slice((currentPage-1)*pageSize,currentPage*pageSize)"
+ :key="index"
+ style="display: flex;align-items: center;margin: 0.1343rem 15px;text-align: left"
+ class="environmental-risk-list">
+ <!-- <div v-if="item.resultType === 1">-->
+ <el-col :span="4">
+ <img src="../../../../../public/assets/images/map/marker-icon.png" alt="" class="state"
+ style="background: none;margin: 0 15px">
+ </el-col>
+ <el-col :span="12">
+ <div class=search-list>
+ <!-- <h4 :class="activeNum===index?'hover':''" @click="handleLocation(index)">鍚嶇О锛�<h3 style="display: inline-block">{{ item.name }}</h3></h4>-->
+ <h3 @click="locationMapClick(2, item, index)" :class="activeNum===index?'hover':''">鍚嶇О锛歿{ item.name }}</h3>
+ <p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">琛屾斂浠ｇ爜锛�<span>{{ item.adminCode }}</span>
+ <p></p>
+ </div>
+ </el-col>
+ <el-col :span="8" style="text-align: right">
+ <el-button type="primary" size="mini" icon="el-icon-position" @click="locationMapClick(2,item,index)">
瀹氫綅
</el-button>
</el-col>
@@ -79,6 +81,7 @@
import { pulseEffect } from '../../../../utils/utils'
import eventBus from '../../../../eventBus'
import iconUrl from '../../../../../public/assets/images/map/marker-icon.png'
+import { publicLocationStore } from './ReportLocation'
export default {
name: 'ReportLocationSearch',
@@ -103,13 +106,6 @@
}
},
methods: {
- handlePage (currentPage) {
- // this.focusLocation()
- this.currentPage = currentPage
- },
- handleLocation (index) {
- this.activeNum = index
- },
// 鎼滅储瀹氫綅
focusLocation () {
// 姣忔杩涜鎼滅储 閮藉涔嬪墠鏁扮粍鍒楄〃杩涜缃┖
@@ -135,40 +131,82 @@
console.log(res)
// 杩斿洖鏁版嵁绫诲瀷 1锛堟櫘閫歅OI锛�
if (res.resultType === 1) {
- this.searchList = res.pois
- // this.total = res.count
- this.total = res.pois.length
+ if (res.pois) {
+ this.searchList = res.pois
+ // this.total = res.count
+ this.total = res.pois.length
+ }
} else if (res.resultType === 2) {
// 杩斿洖鏁版嵁绫诲瀷 2锛堢粺璁�
this.searchListStatistics = res.statistics.priorityCitys
this.total = res.statistics.priorityCitys.length
} else if (res.resultType === 3) {
// 杩斿洖鏁版嵁绫诲瀷 3 area 鍖哄煙
+ } else {
+ this.$message('鏈悳绱㈠埌鎮ㄦ兂瑕佹暟鎹�')
}
})
},
+ // getStyle (index) {
+ // console.log(index)
+ // if (this.activeNum === index) {
+ // return { color: 'red' }
+ // }
+ // },
// 鐐瑰嚮瀹氫綅
- locationMapClick (val, index) {
- this.activeNum = index
- const ps = val.lonlat.trim().split(' ')
- this.marker = window.L.marker([ps[1], ps[0]], {
- icon: window.L.icon({
- iconUrl: iconUrl,
- iconSize: [26, 40],
- iconAnchor: [13, 20]
+ locationMapClick (type, val, index) {
+ // this.activeNum = index
+ // this.getStyle(index)
+ // console.log(val)
+ if (type === 1) {
+ this.activeNum = index
+ const ps = val.lonlat.trim().split(' ')
+ this.marker = window.L.marker([ps[1], ps[0]], {
+ icon: window.L.icon({
+ iconUrl: iconUrl,
+ iconSize: [26, 40],
+ iconAnchor: [13, 20]
+ })
})
- })
- .bindTooltip(val.name, {
- permanent: 'true',
- direction: 'bottom',
- offset: [0, 10],
- sticky: true,
- className: ''
+ .bindTooltip(val.name, {
+ permanent: 'true',
+ direction: 'bottom',
+ offset: [0, 10],
+ sticky: true,
+ className: ''
+ })
+ window.map.addLayer(this.marker)
+ this.layersGroupArrList.push(this.marker)
+ window.map.setView([ps[1], ps[0]], 17)
+ pulseEffect([ps[1], ps[0]])
+ } else if (type === 2) {
+ this.activeNum = index
+ const ps = [val.lon, val.lat]
+ this.marker = window.L.marker([ps[1], ps[0]], {
+ icon: window.L.icon({
+ iconUrl: iconUrl,
+ iconSize: [26, 40],
+ iconAnchor: [13, 20]
+ })
})
- window.map.addLayer(this.marker)
- this.layersGroupArrList.push(this.marker)
- window.map.setView([ps[1], ps[0]], 17)
- pulseEffect([ps[1], ps[0]])
+ .bindTooltip(val.name, {
+ permanent: 'true',
+ direction: 'bottom',
+ offset: [0, 10],
+ sticky: true,
+ className: ''
+ })
+ window.map.addLayer(this.marker)
+ this.layersGroupArrList.push(this.marker)
+ window.map.setView([ps[1], ps[0]], 17)
+ pulseEffect([ps[1], ps[0]])
+ }
+ },
+ // 鍒嗛〉鍔熻兘 褰撳墠椤�
+ handlePage (currentPage) {
+ console.log(currentPage)
+ this.currentPage = currentPage
+ this.activeNum = -1
},
// 鐐瑰嚮纭鎸夐挳浜嬩欢
confirm () {
@@ -176,9 +214,28 @@
for (let i = 0; i < this.layersGroupArrList.length; i++) {
window.map.removeLayer(this.layersGroupArrList[i])
}
+ // 浜嬩欢涓婃姤 浣嶇疆淇℃伅 瀛樺偍鏁版嵁搴�
+ const data = {
+ ID: '',
+ EventID: '',
+ EventPipeline: '',
+ EventPipeSeg: '',
+ EventAffType: '',
+ EventAffCode: '',
+ EventAffPointNum: '',
+ EventPosX: '',
+ EventPosY: '',
+ AcquisitionPeople: '',
+ AcquisitionDate: ''
+ }
+ // 閫氳繃鏂规硶 瀛樺偍鏁版嵁 杩涜 鏁版嵁搴撳瓨鍌ㄦ暟鎹�
+ publicLocationStore(data)
+ // 纭浜嬩欢 缃┖鏁版嵁
this.searchList = []
+ this.searchListStatistics = []
this.clickLocation = ''
this.total = 0
+ // 閫氳繃 浼犻�掓暟鎹� 鍏抽棴 浣嶇疆閫夋嫨
eventBus.$emit('location-setChange', true)
}
}
@@ -186,12 +243,6 @@
</script>
<style lang="less" scoped>
-/*/deep/ .el-row {*/
-/* margin: 2px 0 !important;*/
-/* padding: 0;*/
-/* height: 10px;*/
-/* max-height: 10px;*/
-/*}*/
.environmental-risk-list {
color: @color;
border-bottom: 1px solid rgba(0, 255, 246, 0.14);
@@ -211,6 +262,16 @@
}
}
+//.environmental-risk-list :hover {
+// h3 {
+// color: @color-highlight;
+// }
+//}
+
+//.search-list :hover {
+// color: @color-highlight;
+//}
+
.hover {
color: @color-highlight;
}
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
index 9603092..b1fe66d 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
@@ -1,156 +1,156 @@
<template>
- <div class="ReportLocationSection">
- <el-form :model="form" label-width="120px">
- <el-row class="pipe-line-search">
- <el-col :span="18">
- <el-form-item label="绠＄嚎鍚嶇О:">
- <el-input v-model="form.pipeName" @change="pipelineSearch">
- <el-button style="padding-right:10px;" slot="suffix" type="text" @click="pipelineSearch">
- <img src="../../../../../public/assets/images/map/emergency/search.png" alt="">
- </el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-button type="primary" size="small" icon="el-icon-location-outline" @click="pipeClickLocation">瀹氫綅
- </el-button>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="24">
- <el-form-item label="绠℃缂栫爜:">
- <el-input v-model="form.sectionName" disabled></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="闄勫睘璁炬柦缂栫爜:">
- <el-input v-model="form.affiliatedFacilities" disabled></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="闄勫睘璁炬柦绫诲瀷:">
- <el-input v-model="form.affiliatedFacilitiesCode" disabled></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <div class="pipe-table" v-show="this.tableList.length>=1">
- <el-card>
- <span class="fixed-style" style="display: block">绠＄嚎鍚嶇О</span>
- <el-table
- :data="tableList"
- border
- height="120"
- max-height="140"
- @row-click="sectionShowClick"
- style="width: 100%">
- <el-table-column
- label="搴忓彿"
- type="index"
- >
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- prop="properties.pipename"
- label="绠＄嚎鍚嶇О">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- prop="properties.subchaname"
- label="鏀嚎鍚嶇О">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- prop="properties.mediumtype"
- label="绠＄嚎绫诲瀷">
- </el-table-column>
- <el-table-column width="40" fixed="right" label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button @click="localAdr(scope.row)" type="text" size="small">瀹氫綅</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
- <el-card>
- <span class="fixed-style" style="display: block">绠℃鍒楄〃</span>
- <el-table
- :data="tableListSection"
- border
- @row-click="sectionCode"
- height="100"
- max-height="100"
- style="width: 100%">
- <el-table-column
- show-overflow-tooltip
- prop="properties.pipesegcode"
- label="绠℃缂栫爜">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- prop="properties.startpointnumber"
- label="璧风偣鎺㈡煡鍙�">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- prop="properties.endpointnumber"
- label="缁堢偣鎺㈡煡鍙�">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- prop="properties.material"
- label="鏉愯川">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- prop="properties.embeddingmode"
- label="鍩嬭鏂瑰紡">
- </el-table-column>
- <el-table-column width="40" fixed="right" label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button @click="localAdr(scope.row)" type="text" size="small">瀹氫綅</el-button>
- </template>
- </el-table-column>
- </el-table>
- <span class="fixed-style" style="display: block">闄勫睘璁炬柦鍒楄〃</span>
- <el-table
- :data="tableDataAffFac"
- border
- @row-click="affFacName"
- height="120"
- max-height="140"
- style="width: 100%">
- <el-table-column
- show-overflow-tooltip
- width="150"
- prop="properties.pipecode"
- label="绠＄嚎缂栧彿">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- width="150"
- prop="properties.name"
- label="闄勫睘璁炬柦鍚嶇О">
- </el-table-column>
- <el-table-column
- width="150"
- show-overflow-tooltip
- prop="properties.type"
- label="璁炬柦绫诲瀷">
- </el-table-column>
- <el-table-column width="90" fixed="right" label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button @click="localAdr(scope.row)" type="text" size="small">瀹氫綅</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
- </div>
- <el-row style="text-align: right;margin: 10px">
- <el-button type="primary" @click="confirm" size="small">纭</el-button>
- </el-row>
+ <div class="ReportLocationSection">
+ <el-form :model="form" label-width="120px">
+ <el-row class="pipe-line-search">
+ <el-col :span="18">
+ <el-form-item label="绠＄嚎鍚嶇О:">
+ <el-input v-model="form.pipeName" @change="pipelineSearch">
+ <el-button style="padding-right:10px;" slot="suffix" type="text" @click="pipelineSearch">
+ <img src="../../../../../public/assets/images/map/emergency/search.png" alt="">
+ </el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-button type="primary" size="small" icon="el-icon-location-outline" @click="pipeClickLocation">瀹氫綅
+ </el-button>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="18">
+ <el-form-item label="绠℃缂�:">
+ <el-input v-model="form.sectionName" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="闄勫睘璁炬柦缂栫爜:">
+ <el-input v-model="form.affiliatedFacilities" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="闄勫睘璁炬柦绫诲瀷:">
+ <el-input v-model="form.affiliatedFacilitiesCode" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div class="pipe-table" v-show="this.tableList.length>=1">
+ <el-card>
+ <span class="fixed-style" style="display: block">绠＄嚎鍚嶇О</span>
+ <el-table
+ :data="tableList"
+ border
+ height="120"
+ max-height="140"
+ @row-click="sectionShowClick"
+ style="width: 100%">
+ <el-table-column
+ label="搴忓彿"
+ type="index"
+ >
+ </el-table-column>
+ <el-table-column
+ show-overflow-tooltip
+ prop="properties.pipename"
+ label="绠＄嚎鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ show-overflow-tooltip
+ prop="properties.subchaname"
+ label="鏀嚎鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ show-overflow-tooltip
+ prop="properties.mediumtype"
+ label="绠＄嚎绫诲瀷">
+ </el-table-column>
+ <el-table-column width="40" fixed="right" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button @click="localAdr(scope.row)" type="text" size="small">瀹氫綅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ <el-card>
+ <span class="fixed-style" style="display: block">绠℃鍒楄〃</span>
+ <el-table
+ :data="tableListSection"
+ border
+ @row-click="sectionCode"
+ height="100"
+ max-height="100"
+ style="width: 100%">
+ <el-table-column
+ show-overflow-tooltip
+ prop="properties.pipesegcode"
+ label="绠℃缂栫爜">
+ </el-table-column>
+ <el-table-column
+ show-overflow-tooltip
+ prop="properties.startpointnumber"
+ label="璧风偣鎺㈡煡鍙�">
+ </el-table-column>
+ <el-table-column
+ show-overflow-tooltip
+ prop="properties.endpointnumber"
+ label="缁堢偣鎺㈡煡鍙�">
+ </el-table-column>
+ <el-table-column
+ show-overflow-tooltip
+ prop="properties.material"
+ label="鏉愯川">
+ </el-table-column>
+ <el-table-column
+ show-overflow-tooltip
+ prop="properties.embeddingmode"
+ label="鍩嬭鏂瑰紡">
+ </el-table-column>
+ <el-table-column width="40" fixed="right" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button @click="localAdr(scope.row)" type="text" size="small">瀹氫綅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <span class="fixed-style" style="display: block">闄勫睘璁炬柦鍒楄〃</span>
+ <el-table
+ :data="tableDataAffFac"
+ border
+ @row-click="affFacName"
+ height="120"
+ max-height="140"
+ style="width: 100%">
+ <el-table-column
+ show-overflow-tooltip
+ width="150"
+ prop="properties.pipecode"
+ label="绠＄嚎缂栧彿">
+ </el-table-column>
+ <el-table-column
+ show-overflow-tooltip
+ width="150"
+ prop="properties.name"
+ label="闄勫睘璁炬柦鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ width="150"
+ show-overflow-tooltip
+ prop="properties.type"
+ label="璁炬柦绫诲瀷">
+ </el-table-column>
+ <el-table-column width="90" fixed="right" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button @click="localAdr(scope.row)" type="text" size="small">瀹氫綅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
</div>
+ <el-row style="text-align: right;margin: 10px">
+ <el-button type="primary" @click="confirm" size="small">纭</el-button>
+ </el-row>
+ </div>
</template>
<script>
@@ -159,6 +159,7 @@
import AjaxUtils from '@utils/AjaxUtils'
import eventBus from '../../../../eventBus'
import { WMS_URL } from '../../../../conf/Constants'
+import { publicLocationStore } from './ReportLocation'
export default {
name: 'ReportLocationSection',
@@ -355,9 +356,27 @@
confirm () {
// console.log('鐐瑰嚮纭畾閫夋嫨瀹屾垚')
eventBus.$emit('location-setChange', true)
+ // 浜嬩欢涓婃姤 浣嶇疆淇℃伅 瀛樺偍鏁版嵁搴�
+ const data = {
+ ID: '',
+ EventID: '',
+ EventPipeline: this.form.pipeName,
+ EventPipeSeg: this.form.sectionName,
+ EventAffType: this.form.affiliatedFacilitiesCode,
+ EventAffCode: this.form.affiliatedFacilities,
+ EventAffPointNum: '',
+ EventPosX: '',
+ EventPosY: '',
+ AcquisitionPeople: '',
+ AcquisitionDate: ''
+ }
+ // 閫氳繃鏂规硶 瀛樺偍鏁版嵁 杩涜 鏁版嵁搴撳瓨鍌ㄦ暟鎹�
+ publicLocationStore(data)
+ // 鏁版嵁缃┖
this.form.pipeName = ''
this.form.sectionName = ''
this.form.affiliatedFacilities = ''
+ this.form.affiliatedFacilitiesCode = ''
this.tableList = []
this.tableListSection = []
this.tableDataAffFac = []
@@ -368,86 +387,23 @@
</script>
<style lang="less" scoped>
- /*/deep/ .el-input {*/
- /* width: 0.74353rem;*/
- /*}*/
- .pipe-line-search {
- display: flex;
- align-items: center;
+.pipe-line-search {
+ display: flex;
+ align-items: center;
- .el-button {
- margin: 0 15px;
- }
+ .el-button {
+ margin: 0 15px;
+ }
+}
+
+.pipe-table {
+
+ /deep/ .el-card {
+ .el-table {
+ margin: 0.05345rem auto;
}
+ }
+}
- .pipe-table {
- /*display: flex;*/
- /*align-items: center;*/
- /*justify-content: space-around;*/
-
- /deep/ .el-card {
- /*width: 1.39523rem;*/
- /*max-width: 1.39523rem;*/
- /*height: 0.9343rem;*/
- /*max-height: 0.9343rem;*/
-
- .el-table {
- margin: 0.05345rem auto;
- }
- }
- }
-
- .fixed-style {
- color: @color;
- }
-
- /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;
- }
- }
</style>
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index dfa3a7c..48524dd 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,85 +1,84 @@
<template>
- <div class="sewers-search" v-if="gdVisible">
- <div class="panel-title">{{ title }}</div>
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="鏌ヨ" name="first">
- <div class="search-panel ">
- <el-form ref="form" :model="form" label-width="90px" class="search-form">
- <el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.pipelineType"
- :popper-class="'select-down'">
- <el-option
- v-for="item in items"
- :key="item.code"
- :label="item.name"
- :value="item.name">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item :label="form.pipelineType+'锛�'" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" value-key="code"
- :popper-class="'select-down'" @change="handleDataType">
- <el-option
- v-for="item in subItems"
- :key="item.code"
- :label="item.name"
- :value="item">
- </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-scrollbar style="height:413px;">
- <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
- :class="activeNum===index?'hover':''">
- <img class="state" :src="getImgSrc()" style="background: none"/>
- <div>
- <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code
- }}</h3>
- <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.type }}</span>
- <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
- style="margin-right: 0.04rem;"
- @click="btnAffiliatedFacilities(item,index)">
- 闄勫睘璁炬柦
- </el-button>
- </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>
- </el-tab-pane>
- <el-tab-pane label="鍒嗘瀽" name="second">
- <SewersAnalysis></SewersAnalysis>
- </el-tab-pane>
- <el-tab-pane label="鍘嗗彶" name="third">
- <SewersHistory></SewersHistory>
- </el-tab-pane>
- </el-tabs>
- <!-- 闄勫睘璁炬柦闈㈡澘 -->
- <affiliated-facilities :facilitiesParameter="facilitiesParameter"
- v-if="fuShuSheShiShow"></affiliated-facilities>
- </div>
+ <div class="sewers-search" v-if="gdVisible">
+ <div class="panel-title">{{ title }}</div>
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="鏌ヨ" name="first">
+ <div class="search-panel ">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.pipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item :label="form.pipelineType+'锛�'" size="mini">
+ <el-select style="width: 100%" v-model="form.dataType" value-key="code"
+ :popper-class="'select-down'" @change="handleDataType">
+ <el-option
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item">
+ </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-scrollbar style="height:413px;">
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
+ :class="activeNum===index?'hover':''">
+ <img class="state" :src="getImgSrc()" style="background: none"/>
+ <div>
+ <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code }}</h3>
+ <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.type }}</span>
+ <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
+ style="margin-right: 0.04rem;"
+ @click="btnAffiliatedFacilities(item,index)">
+ 闄勫睘璁炬柦
+ </el-button>
+ </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>
+ </el-tab-pane>
+ <el-tab-pane label="鍒嗘瀽" name="second">
+ <SewersAnalysis></SewersAnalysis>
+ </el-tab-pane>
+ <el-tab-pane label="鍘嗗彶" name="third">
+ <SewersHistory></SewersHistory>
+ </el-tab-pane>
+ </el-tabs>
+ <!-- 闄勫睘璁炬柦闈㈡澘 -->
+ <affiliated-facilities :facilitiesParameter="facilitiesParameter"
+ v-if="fuShuSheShiShow"></affiliated-facilities>
+ </div>
</template>
<script>
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 30102e4..dd8bdac 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -99,7 +99,7 @@
:visible.sync="dialogVisible"
:append-to-body="true"
:modal="false"
- v-dialogDrag
+ v-dialog-drag
>
<EventsReported></EventsReported>
</el-dialog>
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 33cb9b6..56d30b8 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,28 +1,20 @@
<template>
- <div class="full-screen">
- <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
- <div id="map" ref="rootmap">
- </div>
- <sgis-layer-controller></sgis-layer-controller>
- <monitor-panel></monitor-panel>
- <!-- <top-enterprise-panel></top-enterprise-panel>-->
- <tool-box-panel ref="toolBox"></tool-box-panel>
- <!-- <menu-special></menu-special>-->
- <legend-panel></legend-panel>
- <!-- <summary-sheets></summary-sheets>-->
- <SummarySheet></SummarySheet>
- <!-- <enterprise></enterprise> -->
- <!-- <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
- <!-- <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
- <!-- <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
- <!-- <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
-<!-- <PublicBounced ref="PublicBounced"></PublicBounced>-->
- <ReportIncident></ReportIncident>
- <Emergency ref="Emergency"></Emergency>
- <Message></Message>
- <EventsReported></EventsReported>
- <event-handling></event-handling>
+ <div class="full-screen">
+ <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
+ <div id="map" ref="rootmap">
</div>
+ <sgis-layer-controller></sgis-layer-controller>
+ <monitor-panel></monitor-panel>
+ <!-- <top-enterprise-panel></top-enterprise-panel>-->
+ <tool-box-panel ref="toolBox"></tool-box-panel>
+ <!-- <menu-special></menu-special>-->
+ <legend-panel></legend-panel>
+ <!-- <summary-sheets></summary-sheets>-->
+ <SummarySheet></SummarySheet>
+ <Emergency ref="Emergency"></Emergency>
+ <Message></Message>
+ <event-handling></event-handling>
+ </div>
</template>
<script>
@@ -35,18 +27,12 @@
// import summarySheets from '@components/table/summarySheets.vue'SummarySheet
import SummarySheet from '@components/table/summarySheets'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
-// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
-// import Enterprise from '../components/table/enterprise'
-// // 鍏叡灞曠ず鏁版嵁
-// import PublicBounced from '@components/base-page/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
-import ReportIncident from '../components/base-page/enterprise-emergency/discard/ReportIncident'
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/events-reported/EventsReported'
-import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
+import EventHandling from '../components/base-page/enterprise-emergency/event-handling/EventHandling'
export default {
name: 'MapTemplate',
@@ -61,11 +47,8 @@
MonitorPanel,
// summarySheets,
SummarySheet,
- // PublicBounced,
Emergency,
- Message,
- ReportIncident,
- EventsReported
+ Message
},
data () {
return {
@@ -134,59 +117,59 @@
</script>
<style lang="less">
- .flue-gas {
- position: fixed;
- top: 88px;
- left: 180px;
- z-index: 500;
- }
+.flue-gas {
+ position: fixed;
+ top: 88px;
+ left: 180px;
+ z-index: 500;
+}
- .solid-waste {
- position: absolute;
- top: 88px;
- left: 88px;
- z-index: 999;
- }
+.solid-waste {
+ position: absolute;
+ top: 88px;
+ left: 88px;
+ z-index: 999;
+}
- .full-screen {
- width: 100%;
- height: 100%;
- margin: 0;
- padding: 0;
- position: absolute;
+.full-screen {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ position: absolute;
- #map {
- height: 100%;
- width: 100%;
- }
+ #map {
+ height: 100%;
+ width: 100%;
+ }
- .barline {
- //width: 100%;
- //height: 1px;
- //background-color: #0661AE;
- border-top: 1px solid #0661AE;
- }
+ .barline {
+ //width: 100%;
+ //height: 1px;
+ //background-color: #0661AE;
+ border-top: 1px solid #0661AE;
+ }
- #map-btn {
- position: fixed;
- top: 20px;
- left: 100px;
- z-index: 9999;
- }
+ #map-btn {
+ position: fixed;
+ top: 20px;
+ left: 100px;
+ z-index: 9999;
+ }
- .leaflet-custom-icon {
- background: white;
- }
+ .leaflet-custom-icon {
+ background: white;
+ }
- .leaflet-marker-icon {
- background: none;
- }
+ .leaflet-marker-icon {
+ background: none;
+ }
- #migic {
- width: 48px;
- height: 48px;
- margin: -18px -20px;
- z-index: 999;
- }
- }
+ #migic {
+ width: 48px;
+ height: 48px;
+ margin: -18px -20px;
+ z-index: 999;
+ }
+}
</style>
--
Gitblit v1.8.0