From 9706167cee66aa208e538b9d3a5e9ecd88cd7462 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期一, 24 五月 2021 16:28:48 +0800
Subject: [PATCH] 添加企业应急中事件上报/事件处置功能页面
---
src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue | 8
src/components/panel/topicSearch/EnterpriseEmergency/DisposalEvent.vue | 153 ++++++
src/components/layer/src/layer.vue | 4
src/views/MapTemplate.vue | 6
public/assets/images/map/loc.png | 0
src/components/panel/topicSearch/EnterpriseEmergency/PositionChange.vue | 122 +++++
src/components/panel/topicSearch/EnterpriseEmergency/ReportIncident.vue | 474 +++++++++++++++++++++
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | 93 +--
/dev/null | 396 ------------------
src/components/BaseNav/pipeline/AffiliatedFacilities.vue | 4
public/assets/images/map/sewers/应急车辆.png | 0
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js | 14
public/assets/images/map/sewers/应急队伍.png | 0
src/components/emergency/index.vue | 2
src/components/panel/topicSearch/EnterpriseEmergency/PipelineFile.vue | 30 +
15 files changed, 824 insertions(+), 482 deletions(-)
diff --git a/public/assets/images/map/loc.png b/public/assets/images/map/loc.png
new file mode 100644
index 0000000..70f24ed
--- /dev/null
+++ b/public/assets/images/map/loc.png
Binary files differ
diff --git "a/public/assets/images/map/sewers/\345\272\224\346\200\245\350\275\246\350\276\206.png" "b/public/assets/images/map/sewers/\345\272\224\346\200\245\350\275\246\350\276\206.png"
new file mode 100644
index 0000000..672b0b4
--- /dev/null
+++ "b/public/assets/images/map/sewers/\345\272\224\346\200\245\350\275\246\350\276\206.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\345\272\224\346\200\245\351\230\237\344\274\215.png" "b/public/assets/images/map/sewers/\345\272\224\346\200\245\351\230\237\344\274\215.png"
new file mode 100644
index 0000000..f8e01e4
--- /dev/null
+++ "b/public/assets/images/map/sewers/\345\272\224\346\200\245\351\230\237\344\274\215.png"
Binary files differ
diff --git a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
index 87260dc..e7e9008 100644
--- a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
+++ b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
@@ -84,9 +84,9 @@
computed: {
classification () {
const layers = LayerFsss.layers
- console.log(layers)
+ // console.log(layers)
const filtered = layers.filter(function (value, index, array) {
- console.log(value)
+ // console.log(value)
return value.name !== '娴佸悜'
})
return filtered
diff --git a/src/components/emergency/index.vue b/src/components/emergency/index.vue
index c6fc1bf..457fff1 100644
--- a/src/components/emergency/index.vue
+++ b/src/components/emergency/index.vue
@@ -283,7 +283,7 @@
methods: {},
mounted () {
eventBus.$on('events-reported', (obj) => {
- console.log(obj)
+ // console.log(obj)
this.showSchedule = obj
})
}
diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index 64f7411..03400c7 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -2,7 +2,7 @@
<div class="public-bounced map-background" v-drag :style="style">
<div class="public-bounced-title panel-title" ref="publicBounced">
<span>{{ title }}</span>
- <i class="el-icon-circle-close" @click="close"></i>
+ <i class="el-icon-close" @click="close"></i>
</div>
<div class="public-bounced-content" :id="id"></div>
</div>
@@ -48,7 +48,7 @@
},
init () {
const propsData = helper.deepClone(this.content.data) || {}
- console.log(propsData)
+ // console.log(propsData)
const instance = new this.content.comp({
// parent: this.content.parent,
propsData: propsData
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/DisposalEvent.vue b/src/components/panel/topicSearch/EnterpriseEmergency/DisposalEvent.vue
new file mode 100644
index 0000000..d0c624e
--- /dev/null
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/DisposalEvent.vue
@@ -0,0 +1,153 @@
+<template>
+ <div class="disposal-event">
+ <h3 class="panel-title">浜嬩欢鍩烘湰淇℃伅</h3>
+ <el-form ref="form" :model="form" label-width="100px">
+ <el-form-item label="浜嬩欢鍚嶇О锛�" prop="nameOfEvent">
+ <label>{{ form.nameOfEvent }}</label>
+ </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="浜嬩欢浣嶇疆锛�" prop="eventLocation">
+ <label>{{ form.eventLocation }}</label>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浣嶇疆鎻忚堪锛�" prop="positionDesc">
+ <label>{{ form.positionDesc }}</label>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="浜嬩欢鍗曚綅锛�" prop="incidentUnit">
+ <label>{{ form.incidentUnit }}</label>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浜嬪彂鏃堕棿锛�" prop="atTime">
+ <label>{{ form.atTime }}</label>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="浜嬩欢鎻忚堪锛�" prop="eventDesc" class="fixed-width">
+ <label>{{ form.eventDesc }}</label>
+ </el-form-item>
+ <el-form-item label="闄勪欢锛�" prop="upload">
+ <label>
+ <a href="javascript:;">闄勪欢</a>
+
+ <a href="javascript:;">闄勪欢</a>
+ </label>
+ </el-form-item>
+ </el-form>
+ <h3 class="panel-title">棰勬鍖归厤</h3>
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column prop="name" label="棰勬鍚嶇О"></el-table-column>
+ <el-table-column prop="define" label="棰勬瀹氫箟"></el-table-column>
+ <el-table-column prop="hierarchy" label="棰勬灞傜骇"></el-table-column>
+ <el-table-column prop="classification" label="棰勬鍒嗙被"></el-table-column>
+ <el-table-column label="闄勪欢">
+ <template>
+ <a href="javascript:;">棰勬</a>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div class="event-management">
+ <el-button type="primary" size="mini" @click="ToManagement">浜嬩欢绠＄悊</el-button>
+ <el-button size="mini" @click="close()">鍏抽棴</el-button>
+ </div>
+ </div>
+</template>
+
+<script>
+
+import eventBus from '../../../../eventBus'
+
+export default {
+ name: 'DisposalEvent',
+ data () {
+ return {
+ form: {
+ nameOfEvent: '***************浜嬩欢',
+ eventLocation: '**********瑁呯疆',
+ positionDesc: '**********瑁呯疆',
+ incidentUnit: '**********閮ㄩ棬',
+ atTime: '2021骞�5鏈�24鏃� 10:27',
+ eventDesc: '浜嬩欢鎻忚堪浜嬩欢鎻忚堪浜嬩欢鎻忚堪浜嬩欢鎻忚堪'
+ },
+ tableData: [
+ {
+ name: '棰勬A',
+ define: '缁煎悎棰勬',
+ hierarchy: '浜岀骇鍗曚綅',
+ classification: '鐜繚'
+ },
+ {
+ name: '棰勬B',
+ define: '涓撻」棰勬',
+ hierarchy: '鐩村睘浼佷笟',
+ classification: '鐜繚'
+ },
+ {
+ name: '棰勬C',
+ define: '鐜板満澶勭疆棰勬',
+ hierarchy: '鍩哄眰鍗曚綅',
+ classification: '鐢熶骇'
+ },
+ {
+ name: '棰勬D',
+ define: '鐜板満澶勭疆棰勬',
+ hierarchy: '鍩哄眰鍗曚綅',
+ classification: '鐢熶骇'
+ },
+ {
+ name: '棰勬E',
+ define: '鐜板満澶勭疆棰勬',
+ hierarchy: '鍩哄眰鍗曚綅',
+ classification: '鐢熶骇'
+ }
+ ]
+ }
+ },
+ methods: {
+ // 浜嬩欢绠＄悊椤甸潰璺宠浆
+ ToManagement () {
+ eventBus.$emit('events-reported', true)
+ },
+ // 椤甸潰鍏抽棴
+ close () {
+ window.$layer.open({
+ content: {
+ comp: '',
+ parent: this,
+ data: { // 浼犻�掔殑鍙傛暟
+ // info: this.info
+ }
+ },
+ title: ''
+ })
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+ .fixed-width {
+ width: 3.2459893rem;
+ min-width: 3.2459893rem;
+ }
+
+ /deep/ .el-form-item {
+ margin: 5px 0;
+ }
+
+ /deep/ .el-form-item__label {
+ color: @color;
+ font-size: 0.08rem;
+ }
+
+ .event-management {
+ text-align: right;
+ margin: 15px;
+ }
+</style>
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
index 70f0ca1..afe3279 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
@@ -85,7 +85,7 @@
// import WfsHelper from '@components/helpers/WfsHelper'
// import AjaxUtils from '@utils/AjaxUtils'
-import reportPopup from './ReportPopup'
+import ReportIncident from './ReportIncident'
export default {
name: 'EventQuery',
@@ -100,8 +100,8 @@
LayerEvent: {},
LayerResources: {},
// items: [LayerEvent, LayerResources],
- items: [],
// subItems: LayerEntEmer.layers,
+ items: [],
subItems: [],
form: {
pipelineType: '',
@@ -130,13 +130,13 @@
accordPopup () {
window.$layer.open({
content: {
- comp: reportPopup, // 缁勪欢
+ comp: ReportIncident, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
// info: this.info
}
},
- title: '浜嬩欢鍒嗘瀽'
+ title: '涓婃姤浜嬩欢'
})
},
// radio鏁版嵁閫夋嫨
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/PipelineFile.vue b/src/components/panel/topicSearch/EnterpriseEmergency/PipelineFile.vue
new file mode 100644
index 0000000..9adec35
--- /dev/null
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/PipelineFile.vue
@@ -0,0 +1,30 @@
+<template>
+ <div class="pipeline-file map-background" v-show="pipelineFile">
+ <span>绠＄嚎鏂囦欢閫夋嫨</span>
+ </div>
+</template>
+
+<script>
+import eventBus from '../../../../eventBus'
+
+export default {
+ name: 'PipelineFile',
+ data () {
+ return {
+ pipelineFile: false
+ }
+ },
+ mounted () {
+ eventBus.$on('pipelineFile-choose', (obj) => {
+ this.pipelineFile = obj
+ })
+ }
+}
+</script>
+
+<style lang="less" scoped>
+ .pipeline-file {
+ min-width: 1.94532rem;
+ max-height: 2.343213rem;
+ }
+</style>
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/PositionChange.vue b/src/components/panel/topicSearch/EnterpriseEmergency/PositionChange.vue
new file mode 100644
index 0000000..6be9ec7
--- /dev/null
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/PositionChange.vue
@@ -0,0 +1,122 @@
+<template>
+ <div class="side-box map-background" v-show="location">
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="鐐瑰嚮瀹氫綅" name="first">
+ <div class="click-location">
+ <el-input v-model="clickLocation"></el-input>
+ <el-button type="primary">纭</el-button>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="绠＄嚎瀹氫綅" name="second">
+ <div class="line-pos">
+ <el-form :model="linePos" label-width="90px">
+ <el-form-item label="绠＄嚎鍚嶇О:">
+ <el-input v-model="linePos.lineName"></el-input>
+ </el-form-item>
+ <el-form-item label="闄勫睘璁炬柦:">
+ <el-input v-model="linePos.affFac"></el-input>
+ </el-form-item>
+ </el-form>
+ <el-button type="primary" size="mini">鎼滅储</el-button>
+ <el-button type="primary">纭</el-button>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="缁忕含搴﹀畾浣�" name="third">
+ <div class="latlng-location">
+ <div class="latlng-location-chose">
+ <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>
+ <el-button type="primary" size="mini">瀹氫綅</el-button>
+ </div>
+ <el-button type="primary">纭</el-button>
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+</template>
+
+<script>
+import eventBus from '../../../../eventBus'
+
+export default {
+ name: 'PositionChange',
+ props: ['location'],
+ data () {
+ return {
+ pipelineFile: false,
+ activeName: 'first',
+ clickLocation: '',
+ // 缁忕含搴﹀畾浣�
+ LongLatPos: {
+ longPos: '',
+ latPos: ''
+ },
+ // 绠℃瀹氫綅
+ linePos: {
+ lineName: '',
+ affFac: ''
+ }
+ }
+ },
+ methods: {
+ handleClick (tab, event) {
+ // console.log(tab)
+ // console.log(event)
+ if (tab.label === '绠＄嚎瀹氫綅') {
+ eventBus.$emit('pipelineFile-choose', true)
+ } else {
+ eventBus.$emit('pipelineFile-choose', false)
+ }
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+ .side-box {
+ min-width: 1.94532rem;
+ max-height: 1.343213rem;
+ }
+ .click-location {
+ margin: 0 auto;
+ text-align: center;
+
+ .el-input {
+ width: 90%;
+ margin: 15px auto;
+ }
+
+ .el-button {
+ margin: 15px auto;
+ }
+ }
+
+ .line-pos {
+ text-align: center;
+ .el-input {
+ width: 85%;
+ }
+ }
+
+ .latlng-location {
+ text-align: center;
+
+ .latlng-location-chose {
+ display: flex;
+ align-content: center;
+ justify-content: space-around;
+
+ }
+
+ .el-input {
+ width: 85%;
+ }
+ }
+</style>
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ReportIncident.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ReportIncident.vue
new file mode 100644
index 0000000..1327d51
--- /dev/null
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ReportIncident.vue
@@ -0,0 +1,474 @@
+<template>
+ <div class="report-incident" v-drag v-show="eventsReported">
+ <div class="report-box map-background">
+ <div class="public-bounced-title panel-title">
+ <span>浜嬩欢涓婃姤</span>
+ <i class="el-icon-close"></i>
+ </div>
+ <div class="form-popup">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" class="search-form">
+ <!-- 浜嬩欢鍚嶇О-->
+ <el-form-item class="input-event-name" label="浜嬩欢鍚嶇О" prop="nameOfEvent">
+ <el-input v-model="ruleForm.nameOfEvent" placeholder="灏嗕簨浠跺懡鍚�"></el-input>
+ </el-form-item>
+ <!-- 浜嬩欢绫诲瀷-->
+ <el-form-item label="浜嬩欢绫诲瀷" prop="eventOfType">
+ <el-radio-group v-model="ruleForm.eventOfType">
+ <el-radio v-for="(item,index) in ruleForm.eventOfTypeList" :label="item.value" :key="index">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <!-- 浜嬩欢绛夌骇-->
+ <el-form-item label="浜嬩欢绛夌骇" prop="eventOfLevel">
+ <el-radio-group v-model="ruleForm.eventOfLevel">
+ <el-radio v-for="(item,index) in ruleForm.eventOfLevelList" :label="item.value"
+ :key="index">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-row>
+ <!-- 浜嬪彂鍗曚綅-->
+ <el-col :span="12">
+ <el-form-item label="浜嬪彂鍗曚綅" prop="unit">
+ <el-select v-model="ruleForm.unit" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
+ <el-option
+ v-for="item in ruleForm.unitList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <!-- 浜嬪彂鏃堕棿-->
+ <el-col :span="12">
+ <el-form-item class="search-panel-item" label="浜嬪彂鏃堕棿" prop="atTime">
+ <el-date-picker
+ v-model="ruleForm.atTime"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <!-- 浜嬪彂浣嶇疆-->
+ <el-col :span="12">
+ <el-form-item label="浜嬪彂浣嶇疆" prop="positionOf">
+ <el-input v-model="ruleForm.positionOf">
+ <!-- <el-button slot="suffix" type="text" class="el-icon-location-information"-->
+ <!-- @click="locationInfo"></el-button>-->
+ <el-button style="padding-right:10px;" slot="suffix" type="text"
+ @click="locationInfo">
+ <img src="../../../../../public/assets/images/map/loc.png" alt="">
+ </el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <!-- 浣嶇疆鎻忚堪-->
+ <el-col :span="12">
+ <el-form-item label="浣嶇疆鎻忚堪" prop="positionDescription">
+ <el-input v-model="ruleForm.positionDescription"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <!-- 绠＄嚎鍚嶇О-->
+ <el-col :span="12">
+ <el-form-item label="绠＄嚎鍚嶇О" prop="lineName" class="search-panel-item">
+ <el-input disabled v-model="ruleForm.lineName" placeholder="鑷姩甯﹀嚭涓嶅彲淇敼"
+ class="report-input"></el-input>
+ </el-form-item>
+ </el-col>
+ <!-- 绠＄嚎绫诲瀷-->
+ <el-col :span="12">
+ <el-form-item label="绠＄嚎绫诲瀷" prop="lineType">
+ <label>{{ ruleForm.lineTypeText }}</label>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- 鐐瑰嚮涓婁紶-->
+ <el-form-item label="闄勪欢涓婁紶" prop="upload">
+ <el-upload
+ class="upload-demo"
+ action="uploadAction"
+ :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 v-for="item in ruleForm.beingPushList"
+ :key="item.name"
+ :label="item.name"
+ >
+ </el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ <!-- // 鎻忚堪 鎺ユ敹 灞曠ず銆侀殣钘�-->
+ <div v-show="wayTo">
+ <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="desc">
+ <el-input type="textarea" resize="none" v-model="ruleForm.desc"
+ 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>
+ </div>
+ </div>
+<!-- <div class="side-popup map-background">-->
+ <PositionChange :location="location"></PositionChange>
+<!-- </div>-->
+<!-- <div class="pipeline-file map-background">-->
+ <PipelineFile></PipelineFile>
+<!-- </div>-->
+ </div>
+</template>
+
+<script>
+import '../../../../utils/dragBoxes'
+import eventBus from '../../../.././eventBus'
+import DisposalEvent from './DisposalEvent'
+import PositionChange from './PositionChange'
+import PipelineFile from './PipelineFile'
+
+export default {
+ // name: 'ReportPopup',
+ name: 'ReportIncident',
+ components: {
+ PositionChange,
+ PipelineFile
+ },
+ data () {
+ return {
+ // 鍒ゆ柇寮规鏄惁鑳藉睍绀�
+ eventsReported: false,
+ saveSuccess: false,
+ // 琛ㄥ崟缁戝畾鏁版嵁
+ ruleForm: {
+ // 浜嬩欢鍚嶇О 缁戝畾鏁版嵁
+ nameOfEvent: '',
+ // 浜嬩欢绫诲瀷 缁戝畾鏁版嵁鍊�
+ eventOfType: '',
+ // 浜嬩欢绫诲瀷鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
+ eventOfTypeList: [
+ {
+ name: '寰呰ˉ鍏�',
+ value: 1
+ },
+ {
+ name: '寰呰ˉ鍏�',
+ value: 2
+ },
+ {
+ name: '寰呰ˉ鍏�',
+ value: 3
+ }
+ ],
+ // 浜嬩欢绛夌骇
+ eventOfLevel: '',
+ // 浜嬩欢绛夌骇鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
+ eventOfLevelList: [
+ {
+ name: '寰呰ˉ鍏�',
+ value: 1
+ },
+ {
+ name: '寰呰ˉ鍏�',
+ value: 2
+ },
+ {
+ name: '寰呰ˉ鍏�',
+ value: 3
+ }
+ ],
+ // 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
+ unit: '',
+ unitList: [
+ {
+ label: '鎵瓙',
+ value: '1'
+ },
+ {
+ label: '鍗椾含',
+ value: '2'
+ }
+ ],
+ // 浜嬪彂鏃堕棿 缁戝畾鏁版嵁
+ atTime: '',
+ // 浜嬪彂浣嶇疆
+ positionOf: '',
+ // 浣嶇疆鎻忚堪
+ positionDescription: '',
+ // 绠＄嚎鍚嶇О
+ lineName: '',
+ // 绠＄嚎绫诲瀷
+ lineType: '',
+ lineTypeText: '鑷姩甯﹀嚭涓嶅彲淇敼',
+ // 娑堟伅鎺ㄩ��
+ beingPushed: [],
+ beingPushList: [
+ {
+ name: '鐭俊鎺ㄩ��',
+ value: false
+ },
+ {
+ name: '鎵嬫満搴旂敤鎺ㄩ��',
+ value: false
+ }
+ ]
+ },
+ // 琛ㄥ崟楠岃瘉
+ rules: {
+ // 浜嬩欢鍚嶇О鏍￠獙
+ nameOfEvent: [
+ {
+ required: true,
+ message: '璇疯緭鍏ユ椿鍔ㄥ悕绉�',
+ trigger: 'blur'
+ }
+ ],
+ // 浜嬩欢绫诲瀷鏍￠獙
+ eventOfType: [
+ {
+ required: true,
+ message: '璇烽�夋嫨浜嬩欢绫诲瀷',
+ trigger: 'blur'
+ }
+ ],
+ // 浜嬩欢绛夌骇鏍￠獙
+ eventOfLevel: [
+ {
+ required: true,
+ message: '璇烽�夋嫨浜嬩欢绛夌骇',
+ trigger: 'blur'
+ }
+ ],
+ // 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
+ unit: [
+ {
+ required: true,
+ message: '璇烽�夋嫨娲诲姩鍖哄煙',
+ trigger: 'change'
+ }
+ ],
+ // 浜嬪彂鏃堕棿
+ atTime: [
+ {
+ required: true,
+ message: '璇烽�夋嫨娲诲姩璧勬簮',
+ trigger: 'change'
+ }
+ ],
+ // 浜嬩欢浣嶇疆鏍￠獙
+ positionOf: [
+ {
+ required: true,
+ message: '璇疯緭鍏ユ椿鍔ㄤ綅缃�',
+ trigger: 'blur'
+ }
+ ],
+ // 浣嶇疆鎻忚堪鏍￠獙
+ positionDescription: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヤ綅缃弿杩�',
+ trigger: 'blur'
+ }
+ ],
+ // 绠＄嚎鍚嶇О
+ lineName: [],
+ // 绠＄嚎绫诲瀷
+ lineType: []
+ },
+ // 鎻忚堪 鎺ユ敹 => 灞曠ず/闅愯棌
+ wayTo: false,
+ location: false,
+ // 涓婁紶鍒楄〃
+ fileList: [],
+ // 涓婁紶鍦板潃
+ uploadAction: ''
+ }
+ },
+ methods: {
+ // 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
+ infotsChange () {
+ if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
+ // console.log('鍖呭惈璇ュ厓绱�')
+ this.wayTo = true
+ } else {
+ // console.log('涓嶅寘鍚鍏冪礌')
+ this.wayTo = false
+ }
+ },
+ // 鐐瑰嚮瀹氫綅 杩涜浣嶇疆閫夋嫨
+ locationInfo () {
+ // console.log('浣嶇疆淇℃伅閫夋嫨')
+ this.location = !this.location
+ eventBus.$emit('pipelineFile-choose', 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}锛焋)
+ },
+ // 琛ㄥ崟鐨勭‘璁ゆ寜閽偣鍑讳簨浠�
+ submitForm (formName) {
+ // this.$refs[formName].validate((valid) => {
+ // if (valid) {
+ // alert('submit!')
+ // } else {
+ // console.log('error submit!!')
+ // return false
+ // }
+ // })
+
+ // temp涓存椂
+ // window.mapManager.clickDialogSwitch = false
+ // this.eventsReported = false
+ // eventBus.$emit('events-reported', true)
+
+ // this.eventsReported = false
+ // this.saveSuccess = true
+
+ // temp 涓存椂鏂规硶2
+ window.$layer.open({
+ content: {
+ comp: DisposalEvent,
+ parent: this,
+ data: { // 浼犻�掔殑鍙傛暟
+ // info: this.info
+ }
+ },
+ title: '浜嬩欢澶勭疆'
+ })
+ },
+ // 澶勭疆鍒嗘瀽
+ disposalAnalysis () {
+ this.saveSuccess = false
+ eventBus.$emit('events-reported', true)
+ },
+ // form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
+ resetForm (formName) {
+ this.$refs[formName].resetFields()
+ this.eventsReported = false
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+ .report-incident {
+ position: absolute;
+ display: inline-flex;
+ overflow: hidden;
+ top: 0.42979rem;
+ left: 0.14583rem;
+ z-index: 500;
+
+ .report-box {
+ .public-bounced-title {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ span {
+ color: #f4f7ff;
+ margin: 0 15px;
+ font-size: 14px;
+ }
+
+ i {
+ color: #C0C4CC;
+ margin: 0 15px;
+ font-size: 22px;
+ cursor: pointer;
+ }
+ }
+ }
+ }
+
+ /deep/ .el-form-item {
+ margin: 10px 0;
+ }
+
+ /deep/ .el-textarea__inner {
+ width: 2rem;
+ color: darkgrey;
+ border: solid 1px #00fff6;
+ background-color: rgba(0, 255, 246, 0.14);
+ outline: none;
+ font-size: 0.01rem;
+ }
+
+ /deep/ .el-checkbox__label {
+ color: #00fff6 !important;
+ }
+
+ /deep/ input {
+ /*width: 145px;*/
+ border-radius: 0;
+ background-color: rgba(0, 255, 246, 0.14);
+ border: solid 1px #00fff6;
+ color: #C0C4CC;
+ font-size: 0.01rem;
+ }
+
+ /deep/ .el-input.is-disabled .el-input__inner {
+ color: #C0C4CC;
+ font-size: 0.01rem;
+ border-radius: 4px;
+ background: @background-color;
+ border-color: @color;
+ }
+
+ /deep/ .el-input__inner {
+ /*width: 145px;*/
+ border-radius: 5px;
+ background: rgba(0, 16, 30, 0.5);
+ }
+
+ /deep/ .el-form-item__label {
+ color: @color;
+ }
+
+ /deep/ .el-radio__label {
+ color: @color;
+ }
+
+ .confirmCancel {
+ text-align: right;
+ margin: 15px;
+ /*display: flex;*/
+ /*justify-content: flex-end;*/
+ }
+</style>
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue
deleted file mode 100644
index bdbd49e..0000000
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue
+++ /dev/null
@@ -1,396 +0,0 @@
-<template>
-<!-- <el-dialog-->
-<!-- custom-class="events-reported"-->
-<!-- title="涓婃姤浜嬩欢"-->
-<!-- :visible.sync="eventsReported"-->
-<!-- :append-to-body="true"-->
-<!-- :modal="false"-->
-<!-- v-dialogDrag-->
-<!-- >-->
-<!-- </el-dialog>-->
- <div>
- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" class="search-form">
- <!-- 浜嬩欢鍚嶇О-->
- <el-form-item class="input-event-name" label="浜嬩欢鍚嶇О" prop="nameOfEvent">
- <el-input v-model="ruleForm.nameOfEvent" placeholder="灏嗕簨浠跺懡鍚�"></el-input>
- </el-form-item>
- <!-- 浜嬩欢绫诲瀷-->
- <el-form-item label="浜嬩欢绫诲瀷" prop="eventOfType">
- <el-radio-group v-model="ruleForm.eventOfType">
- <el-radio v-for="(item,index) in ruleForm.eventOfTypeList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
- </el-radio-group>
- </el-form-item>
- <!-- 浜嬩欢绛夌骇-->
- <el-form-item label="浜嬩欢绛夌骇" prop="eventOfLevel">
- <el-radio-group v-model="ruleForm.eventOfLevel">
- <el-radio v-for="(item,index) in ruleForm.eventOfLevelList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
- </el-radio-group>
- </el-form-item>
- <el-row>
- <!-- 浜嬪彂鍗曚綅-->
- <el-col :span="12">
- <el-form-item label="浜嬪彂鍗曚綅" prop="unit">
- <el-select v-model="ruleForm.unit" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
- <el-option
- v-for="item in ruleForm.unitList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <!-- 浜嬪彂鏃堕棿-->
- <el-col :span="12">
- <el-form-item class="search-panel-item" label="浜嬪彂鏃堕棿" prop="atTime">
- <el-date-picker
- v-model="ruleForm.atTime"
- type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <!-- 浜嬪彂浣嶇疆-->
- <el-col :span="12">
- <el-form-item label="浜嬪彂浣嶇疆" prop="positionOf">
- <el-input v-model="ruleForm.positionOf"></el-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="https://jsonplaceholder.typicode.com/posts/"
- :on-preview="handlePreview"
- :on-remove="handleRemove"
- :before-remove="beforeRemove"
- multiple
- :limit="3"
- :on-exceed="handleExceed"
- :file-list="fileList">
- <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
- </el-upload>
- </el-form-item>
- <!-- 娑堟伅鎺ㄩ��-->
- <el-form-item label="娑堟伅鎺ㄩ��" prop="beingPush">
- <el-checkbox-group v-model="ruleForm.beingPushed" @change="infotsChange">
- <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">
- <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="desc">
- <el-input type="textarea" resize="none" v-model="ruleForm.desc" 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>
- </div>
-</template>
-
-<script>
-
-import eventBus from '../../../.././eventBus'
-
-export default {
- name: 'ReportPopup',
- data () {
- return {
- // eventsReported: true,
- eventsReported: false,
- saveSuccess: false,
- // 琛ㄥ崟缁戝畾鏁版嵁
- ruleForm: {
- // 浜嬩欢鍚嶇О 缁戝畾鏁版嵁
- nameOfEvent: '',
- // 浜嬩欢绫诲瀷 缁戝畾鏁版嵁鍊�
- eventOfType: '',
- // 浜嬩欢绫诲瀷鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
- eventOfTypeList: [
- {
- name: '寰呰ˉ鍏�',
- value: 1
- },
- {
- name: '寰呰ˉ鍏�',
- value: 2
- },
- {
- name: '寰呰ˉ鍏�',
- value: 3
- }
- ],
- // 浜嬩欢绛夌骇
- eventOfLevel: '',
- // 浜嬩欢绛夌骇鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
- eventOfLevelList: [
- {
- name: '寰呰ˉ鍏�',
- value: 1
- },
- {
- name: '寰呰ˉ鍏�',
- value: 2
- },
- {
- name: '寰呰ˉ鍏�',
- value: 3
- }
- ],
- // 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
- unit: '',
- unitList: [
- {
- label: '鎵瓙',
- value: '1'
- },
- {
- label: '鍗椾含',
- value: '2'
- }
- ],
- // 浜嬪彂鏃堕棿 缁戝畾鏁版嵁
- atTime: '',
- // 浜嬪彂浣嶇疆
- positionOf: '',
- // 浣嶇疆鎻忚堪
- positionDescription: '',
- // 绠＄嚎鍚嶇О
- lineName: '',
- // 绠＄嚎绫诲瀷
- lineType: '',
- lineTypeText: '鑷姩甯﹀嚭涓嶅彲淇敼',
- // 娑堟伅鎺ㄩ��
- beingPushed: [],
- beingPushList: [
- {
- name: '鐭俊鎺ㄩ��',
- value: false
- },
- {
- name: '鎵嬫満搴旂敤鎺ㄩ��',
- value: false
- }
- ]
- },
- // 琛ㄥ崟楠岃瘉
- 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,
- // 涓婁紶
- fileList: []
- }
- },
- methods: {
- // 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
- infotsChange () {
- if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
- // console.log('鍖呭惈璇ュ厓绱�')
- this.wayTo = true
- } else {
- // console.log('涓嶅寘鍚鍏冪礌')
- this.wayTo = 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}锛焋)
- },
- // 琛ㄥ崟鐨勭‘璁ゆ寜閽偣鍑讳簨浠�
- submitForm (formName) {
- // this.$refs[formName].validate((valid) => {
- // if (valid) {
- // alert('submit!')
- // } else {
- // console.log('error submit!!')
- // return false
- // }
- // })
- // this.eventsReported = false
- // this.saveSuccess = true
-
- // temp涓存椂
- window.mapManager.clickDialogSwitch = false
- this.eventsReported = false
- eventBus.$emit('events-reported', true)
- },
- // 澶勭疆鍒嗘瀽
- disposalAnalysis () {
- this.saveSuccess = false
- eventBus.$emit('events-reported', true)
- },
- // form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
- resetForm (formName) {
- this.$refs[formName].resetFields()
- }
- }
-}
-</script>
-
-<style lang="less" scoped>
-
- /deep/ .el-form-item {
- margin: 5px 0;
- }
-
- /deep/ .el-textarea__inner {
- width: 2rem;
- color: darkgrey;
- border: solid 1px #00fff6;
- background-color: rgba(0, 255, 246, 0.14);
- outline: none;
- font-size: 0.01rem;
- }
-
- /deep/ .el-checkbox__label {
- color: #00fff6 !important;
- }
-
- /deep/ input {
- /*width: 145px;*/
- border-radius: 0;
- background-color: rgba(0, 255, 246, 0.14);
- border: solid 1px #00fff6;
- color: #C0C4CC;
- font-size: 0.01rem;
- }
-
- /deep/ .el-input.is-disabled .el-input__inner {
- color: #C0C4CC;
- font-size: 0.01rem;
- border-radius: 4px;
- background: @background-color;
- border-color: @color;
- }
-
- /deep/ .el-input__inner {
- /*width: 145px;*/
- border-radius: 5px;
- background: rgba(0, 16, 30, 0.5);
- }
-
- /deep/ .el-form-item__label {
- color: @color;
- }
-
- /deep/ .el-radio__label {
- color: @color;
- }
-
- .confirmCancel {
- text-align: right;
- /*display: flex;*/
- /*justify-content: flex-end;*/
- }
-</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index e7b8aeb..6812567 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -15,9 +15,6 @@
label="绠℃鍚嶇О"></el-table-column>
<el-table-column sortable width="100" prop="startpointnumber" label="璧风偣缂栧彿"></el-table-column>
<el-table-column sortable width="100" prop="endpointnumber" label="缁堢偣缂栧彿"></el-table-column>
-<!-- <el-table-column v-for="(item, index) in tableDataLinkStartList" :key="index" :prop="item.prop"-->
-<!-- :label="item.label" :show-overflow-tooltip="true" min-width="100" :sortable="item.sortable">-->
-<!-- </el-table-column>-->
<el-table-column width="40" fixed="right" class-name="fixed-table" label="鎿嶄綔">
<template slot-scope="scope">
<el-button @click="linkSelectStart(scope.row)" type="text" size="small">閫夋嫨</el-button>
@@ -64,34 +61,12 @@
export default {
name: 'Connectivity',
- props: ['tableData'],
data () {
return {
// 杩為�氭�� // 1 杩為�氭�ц捣濮嬬娈� 0 杩為�氭�х粨鏉熺娈� 鐢ㄦ潵鍒ゆ柇鏄偣鍑讳簡璧峰 杩樻槸缁撴潫绠℃
linkType: 1,
// 杩為�氭�� 璧峰绠℃ 琛ㄦ牸鏁版嵁
tableDataLinkStart: [],
- tableDataLinkStartList: [// table 琛ㄦ牸瀹氫箟鐨勫瓧娈�
- {
- label: '绠℃绫诲瀷',
- prop: 'datasource'
- },
- {
- label: '绠℃鍚嶇О',
- prop: 'pipecode',
- sortable: true
- },
- {
- label: '璧风偣缂栧彿',
- prop: 'material',
- sortable: true
- },
- {
- label: '缁堢偣缂栧彿',
- prop: 'material',
- sortable: true
- }
- ],
// 杩為�氭�� 缁撴潫绠℃ 琛ㄦ牸鏁版嵁
tableDataLinkEnd: [],
// 杩為�氭�� 鍒嗘瀽缁撴灉 灞曠ず => 杩為�� || 涓嶈繛閫�
@@ -120,17 +95,15 @@
// 鍦板浘涓婄偣鍑�
selectPipeLine () {
window.map.on('click', this.selectClick)
- // window.mapManager.clickDialogSwitch = false
+ window.mapManager.clickDialogSwitch = false
},
// 鍦板浘涓婄偣鍑诲洖璋�
selectClick (e) {
// console.log(e)
+ // window.mapManager.clickDialogSwitch = true
window.map.off('click', this.selectClick)
- window.mapManager.clickDialogSwitch = false
const point = [e.latlng.lng, e.latlng.lat]
this.getPipeLine(point)
- // this.getPipeLine(point, this.linkType)
- // window.mapManager.clickDialogSwitch = true
},
// 鐐瑰嚮鑾峰彇鍒ゆ柇鏁版嵁
async getPipeLine (point) {
@@ -141,12 +114,42 @@
}
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
const res = await mapApi.findPipelineByClickPoint(param)
- console.log(res)
+ // console.log(res)
if (this.linkType === 1) {
this.tableDataLinkStart = res.data
} else {
this.tableDataLinkEnd = res.data
}
+ },
+ // 杩為�氭�х殑娓呴櫎鍔熻兘
+ handleClick () {
+ // this.linkClear()
+ if (this.currentSelectStartLine != null) {
+ this.currentSelectStartLine.remove()
+ this.currentSelectStartLine = null
+ }
+ if (this.currentSelectEndLine != null) {
+ this.currentSelectEndLine.remove()
+ this.currentSelectEndLine = null
+ }
+ if (this.currentSelectResultLine != null) {
+ this.currentSelectResultLine.remove()
+ this.currentSelectResultLine = null
+ }
+ this.currentLinkIsTrue = ''
+ this.tableDataLinkStart = []
+ this.tableDataLinkEnd = []
+ this.tableDataLinkResult = []
+ if (this.flowPipeLine != null) {
+ this.flowPipeLine.remove()
+ this.flowPipeLine = null
+ }
+ if (this.linkPipeline.length > 0) {
+ this.linkPipeline.forEach((itm, idx) => {
+ itm.remove()
+ })
+ }
+ this.linkPipeline = []
},
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
@@ -279,36 +282,6 @@
}
}).addTo(window.map)
window.map.panInsideBounds(this.currentSelectResultLine.getBounds())
- },
- // 杩為�氭�х殑娓呴櫎鍔熻兘
- handleClick () {
- // this.linkClear()
- if (this.currentSelectStartLine != null) {
- this.currentSelectStartLine.remove()
- this.currentSelectStartLine = null
- }
- if (this.currentSelectEndLine != null) {
- this.currentSelectEndLine.remove()
- this.currentSelectEndLine = null
- }
- if (this.currentSelectResultLine != null) {
- this.currentSelectResultLine.remove()
- this.currentSelectResultLine = null
- }
- this.currentLinkIsTrue = ''
- this.tableDataLinkStart = []
- this.tableDataLinkEnd = []
- this.tableDataLinkResult = []
- if (this.flowPipeLine != null) {
- this.flowPipeLine.remove()
- this.flowPipeLine = null
- }
- if (this.linkPipeline.length > 0) {
- this.linkPipeline.forEach((itm, idx) => {
- itm.remove()
- })
- }
- this.linkPipeline = []
}
}
}
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
index 72a716e..cee79e6 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
@@ -1,17 +1,3 @@
-export function selectPipeLine () {
- window.map.on('click', this.selectClick)
- window.mapManager.clickDialogSwitch = true
-}
-
-// 鍦板浘涓婄偣鍑诲洖璋�
-export function selectClick (e) {
- window.map.off('click', this.selectClick)
- const point = [e.latlng.lng, e.latlng.lat]
- this.getPipeLine(point)
- // this.getPipeLine(point, this.linkType)
- // window.mapManager.clickDialogSwitch = true
-}
-
export function createFlowLine (param) {
const flowLine = window.L.polyline(param.points, param.option)
flowLine.addTo(window.map)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 234f7e0..7c44afe 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -17,7 +17,7 @@
<!-- <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>-->
- <ReportPopup></ReportPopup>
+ <ReportIncident></ReportIncident>
<Emergency ref="Emergency"></Emergency>
<Message></Message>
</div>
@@ -39,7 +39,7 @@
// // 鍏叡灞曠ず鏁版嵁
// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
-import ReportPopup from '../components/panel/topicSearch/EnterpriseEmergency/ReportPopup'
+import ReportIncident from '../components/panel/topicSearch/EnterpriseEmergency/ReportIncident'
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
import Message from '@components/message/index'
@@ -59,7 +59,7 @@
// PublicBounced,
Emergency,
Message,
- ReportPopup
+ ReportIncident
},
data () {
return {
--
Gitblit v1.8.0