From 93a9b3228d214602a899791992726a01925c5ac4 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期四, 13 五月 2021 14:20:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 1
src/components/BaseNav/pipeline/AffiliatedFacilities.vue | 11 +-
src/conf/layers/LayerSurroundings.js | 61 ++++++++++++
src/conf/MapConfig.js | 3
src/conf/layers/LayerArea.js | 6
src/conf/layers/LayerPk.js | 10 +
src/views/MapTemplate.vue | 5
src/conf/layers/LayerEmergencySource.js | 41 ++++++++
src/components/emergency/index.vue | 105 +++++++++++++++++++++
src/components/LayerController/modules/LcServiceLayer.vue | 5 +
src/conf/LayerEmergency.js | 14 ++
11 files changed, 247 insertions(+), 15 deletions(-)
diff --git a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
index b38b54c..c2e2514 100644
--- a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
+++ b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
@@ -15,8 +15,8 @@
<div class="el-select el-select--mini">8888</div>
</el-form-item> -->
<el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'">
- <el-option v-for="(item,index) in classification" :key="index" :label="item.name" :value="item"></el-option>
+ <el-select style="width: 100%" v-model="dataType" @change="handleDataType" :popper-class="'select-down'">
+ <el-option v-for="(item,index) in classification" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
<div class="rightButtonSearch">
@@ -62,6 +62,7 @@
areaVal: '',
keyword: ''
},
+ dataType: '',
classification: LayerFsss.layers,
list: [],
activeNum: -1
@@ -94,17 +95,17 @@
window.layerFactory.flyByFeature(val1, val.code)
},
handleDataType () {
-
+ console.log(this.dataType)
},
async handleSearch () {
var wfsHelper = new WfsHelper()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- wfsHelper.addTypeName(this.form.dataType.sname)
+ wfsHelper.addTypeName(this.dataType)
wfsHelper.addLike('name', this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
- console.log(res)
+ // console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
const datas = res.features
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 255725f..46a7391 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -53,9 +53,14 @@
item.checked = !item.checked
this.toggleLayer(item)
this.swLayers(item.layers, item.checked)
+ // 鍒ゆ柇鏄惁鏄偣鍑� 涓撻鍥惧眰 涓嬬殑瀛愯妭鐐�
if (v === '涓撻鍥惧眰') {
bus.$emit('changeSearchBar', item)
}
+ // 鍒ゆ柇鏄惁鐐瑰嚮鐨� 涓�绾т笓棰樺浘灞�
+ if (item.name === '涓撻鍥惧眰') {
+ console.log(item, '88888888888888')
+ }
this.serviceLayers.forEach(function (item1, index1) {
if (item1.layers) {
diff --git a/src/components/emergency/index.vue b/src/components/emergency/index.vue
new file mode 100644
index 0000000..3467c7b
--- /dev/null
+++ b/src/components/emergency/index.vue
@@ -0,0 +1,105 @@
+<template>
+ <el-dialog class="emergency" :visible.sync="showSchedule" :title="tit" :modal="false" v-dialogDrag >
+ <!-- 鍩虹淇℃伅 -->
+ <div class="basicInformation">
+ <div>
+ <h3 class="panel-title">婕旂粌淇℃伅</h3>
+ <ul>
+ <li>浜嬩欢绫诲瀷锛�</li>
+ <li>浜嬩欢浣嶇疆锛�</li>
+ <li>浣嶇疆鎻忚堪锛�</li>
+ <li>浜嬩欢鏃堕棿锛�</li>
+ <li>闄勪欢锛�<a href="javascript:;">闄勪欢1</a><a href="javascript:;">闄勪欢1</a></li>
+ </ul>
+ <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>
+ <el-button type="primary" size="mini">鍒嗘瀽</el-button>
+ </div>
+ <!-- <div>
+ <div class="panel-title">澶勭疆鍒嗘瀽</div>
+ <div class="area-selected">
+ <el-button type="primary" class="el-icon-location" size="mini"></el-button>
+ <el-button type="primary" class="el-icon-location" size="mini"></el-button>
+ <el-select v-model="value" filterable placeholder="璇烽�夋嫨" size="mini">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ </el-select>
+ <el-button type="primary" class="el-icon-search" size="mini"></el-button>
+ </div>
+ <div>
+ <div class="analysis-btn">
+ <div>
+ <el-button type="primary" size="mini" >閲嶇疆鍒嗘瀽鏉′欢</el-button>
+ <el-button type="primary" size="mini" >寮�濮嬪垎鏋�</el-button>
+ </div>
+ </div>
+ </div>
+ </div> -->
+ </div>
+ </el-dialog>
+</template>
+
+<script>
+const cityOptions = ['涓婃捣', '鍖椾含', '骞垮窞', '娣卞湷']
+export default {
+ name: 'index',
+ data () {
+ return {
+ tit: '浜嬩欢澶勭疆',
+ showSchedule: false,
+ 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: '鐢熶骇' }
+ ],
+ checkAll: false,
+ checkedCities: ['涓婃捣', '鍖椾含'],
+ cities: cityOptions,
+ isIndeterminate: true,
+ value: '',
+ options: [{ value: '500', label: '500m' }, { value: '1000', label: '1km' }, { value: '2000', label: '2km' }, { value: '5000', label: '5km' }, { value: '10000', label: '10km' }]
+ }
+ },
+ methods: {
+
+ },
+ mounted () {
+
+ }
+}
+</script>
+
+<style scoped lang="less">
+.emergency{
+ /deep/ .el-dialog{
+ width: 450px;
+ }
+ .panel-title{
+ text-align: left;
+ padding: 5px 0 0 0;
+ }
+ .basicInformation{
+ .area-selected{
+ display: flex;
+ justify-content:flex-end;
+ align-items : center;
+ }
+ .analysis-btn{
+ display: flex;
+ justify-content:space-between;
+ align-items : center;
+ }
+ }
+}
+</style>
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 0f7114d..fd8749e 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -86,7 +86,6 @@
hbVisible: false,
pkVisible: false,
toggleMonitorStyle: 'right:0px',
-
title: '姹￠洦姘寸缃�',
isCollapse: true,
selectGroup: false
diff --git a/src/conf/LayerEmergency.js b/src/conf/LayerEmergency.js
new file mode 100644
index 0000000..e272e9d
--- /dev/null
+++ b/src/conf/LayerEmergency.js
@@ -0,0 +1,14 @@
+/**
+ * 涓撻
+ */
+import { LayerEmergencySource } from './layers/LayerEmergencySource'
+import { LayerSurroundings } from './layers/LayerSurroundings'
+
+export const LayerEmergency = {
+ code: 'sewersEmergency',
+ name: '搴旀�ュ浘灞�',
+ checked: false,
+ isShow: true,
+ type: 0,
+ layers: [LayerEmergencySource, LayerSurroundings]
+}
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index e125556..9004cc8 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -2,6 +2,7 @@
import TDT from './TDT'
import { LayerTopic } from './LayerTopic'
import { LayerBasin } from './layers/LayerBasin'
+import { LayerEmergency } from './LayerEmergency'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -41,7 +42,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerBasin, LayerTopic]
+ LayerSewersLine: [LayerBasin, LayerTopic, LayerEmergency]
} // 姹￠洦姘村浘灞傞厤缃�
}
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index b16cf81..4788af3 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -1,7 +1,7 @@
/**
* 鍖哄煙
*/
-import { PIPELINE_WFS } from '../Constants'
+import { SERVICE_TYPE, PIPELINE_WFS } from '../Constants'
const WFS_URL = PIPELINE_WFS
export const LayerArea = {
code: 'sewersArea',
@@ -30,8 +30,8 @@
name: '瑁呯疆鍖�',
sname: '瑁呯疆鍖�',
checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:unitareaboundary'
}
]
}
diff --git a/src/conf/layers/LayerEmergencySource.js b/src/conf/layers/LayerEmergencySource.js
new file mode 100644
index 0000000..bdf018e
--- /dev/null
+++ b/src/conf/layers/LayerEmergencySource.js
@@ -0,0 +1,41 @@
+import { SERVICE_TYPE } from '../Constants'
+
+/**
+ * 搴旀�ヨ祫婧�
+ */
+export const LayerEmergencySource = {
+ code: 'sewersEmergencySource',
+ name: '搴旀�ヨ祫婧�',
+ checked: false,
+ layers: [
+ {
+ code: 'sewersYjWz',
+ name: '搴旀�ョ墿璧�',
+ sname: '搴旀�ョ墿璧�',
+ checked: false,
+ type: SERVICE_TYPE.WMS,
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ typeName: 'sewer:emergencyesources',
+ minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+ },
+ {
+ code: 'sewersYjcl',
+ name: '搴旀�ヨ溅杈�',
+ sname: '搴旀�ヨ溅杈�',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ minZoom: 10
+ },
+ {
+ code: 'sewersYjdw',
+ name: '搴旀�ラ槦浼�',
+ sname: '搴旀�ラ槦浼�',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:maintenanceteam',
+ minZoom: 10
+ }
+ ]
+}
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index 4b3fc8b..b1b95be 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -1,3 +1,5 @@
+import { SERVICE_TYPE } from '../Constants'
+
/**
* 鎺掑彛
*/
@@ -13,9 +15,9 @@
name: '鍐呮帓鍙�',
sname: '鍐呮帓鍙�',
checked: true,
- type: 0,
+ type: SERVICE_TYPE.WMS,
icon: 'sewers/闆ㄦ按鎺掑彛.png',
- wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=sewer:dischargeport&maxFeatures=50&outputFormat=application/json&cql_filter=pfktype=\'鍐呮帓\'',
+ typeName: 'sewer:dischargeport',
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
{
@@ -24,8 +26,8 @@
sname: '澶栨帓鍙�',
icon: 'sewers/闆ㄦ按鎺掑彛.png',
checked: true, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=sewer:dischargeport&maxFeatures=50&outputFormat=application/json&cql_filter=pfktype=\'澶栨帓\'',
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:dischargeport',
minZoom: 10
}
]
diff --git a/src/conf/layers/LayerSurroundings.js b/src/conf/layers/LayerSurroundings.js
new file mode 100644
index 0000000..a872133
--- /dev/null
+++ b/src/conf/layers/LayerSurroundings.js
@@ -0,0 +1,61 @@
+import { SERVICE_TYPE } from '../Constants'
+
+/**
+ * 鍛ㄨ竟鐜
+ */
+export const LayerSurroundings = {
+ code: 'sewersSurroundings',
+ name: '搴旀�ヨ祫婧�',
+ checked: false,
+ layers: [
+ {
+ code: 'sewersYy',
+ name: '鍖婚櫌',
+ sname: '鍖婚櫌',
+ checked: false,
+ type: SERVICE_TYPE.WMS,
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ typeName: 'sewer:hospital',
+ minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+ },
+ {
+ code: 'sewersXx',
+ name: '瀛︽牎',
+ sname: '瀛︽牎',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ minZoom: 10
+ },
+ {
+ code: 'sewersSt',
+ name: '姘翠綋',
+ sname: '姘翠綋',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:pointhydrology',
+ minZoom: 10
+ },
+ {
+ code: 'sewersZrbhq',
+ name: '鑷劧淇濇姢鍖�',
+ sname: '鑷劧淇濇姢鍖�',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ wfs: 'sewer:pointpreservationzone',
+ minZoom: 10
+ },
+ {
+ code: 'sewersMgmb',
+ name: '鏁忔劅鐩爣',
+ sname: '鏁忔劅鐩爣',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ wfs: 'sewer:sensitivetarget',
+ minZoom: 10
+ }
+ ]
+}
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 23d4259..2b070d3 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -18,6 +18,7 @@
<!-- <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
<PublicBounced ref="PublicBounced"></PublicBounced>
<!-- <ReportPopup></ReportPopup>-->
+ <Emergency ref="Emergency"></Emergency>
</div>
</template>
@@ -39,6 +40,7 @@
import LayerFactory from '@components/LayerController/service/LayerFactory'
import EventHandler from '../components/LayerController/event/EventHandler'
// import ReportPopup from '../components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup'
+import Emergency from '@components/emergency/index'
export default {
name: 'MapTemplate',
@@ -52,7 +54,8 @@
MonitorPanel,
// summarySheets,
SummarySheet,
- PublicBounced
+ PublicBounced,
+ Emergency
// ReportPopup
},
data () {
--
Gitblit v1.8.0