From 65113eae10994702a740a79e7461539d7bcbba08 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 19:02:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 18 +
src/api/request.js | 2
src/components/panel/ToolBoxPanel.vue | 77 +++++----
src/conf/layers/LayerArea.js | 8
src/conf/layers/LayerPk.js | 6
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 106 +++++++++++--
src/components/LayerController/logic/Company.js | 29 +-
src/views/MapTemplate.vue | 22 --
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue | 5
src/components/LayerController/service/LayerFactory.js | 75 +++++----
src/components/BaseNav/PublicBounced/PublicBounced.vue | 16 +
src/components/LayerController/modules/LcServiceLayer.vue | 7
src/assets/images/map-pages/icon/toolbox/cross.png | 0
src/assets/images/map-pages/icon/toolbox/fullscreen.png | 0
src/conf/layers/LayerHbss.js | 69 +++----
src/conf/Constants.js | 5
src/conf/MapConfig.js | 4
src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue | 1
src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue | 1
src/assets/images/map-pages/icon/toolbox/vertical.png | 0
src/components/LayerController/logic/SolidWaste.js | 13 +
21 files changed, 280 insertions(+), 184 deletions(-)
diff --git a/src/api/request.js b/src/api/request.js
index 5db8fa9..acdca70 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -9,7 +9,7 @@
})
}
export const FlueGas = (data = {}) => {
- return $http.post('/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
+ return $http.post('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
headers: {
'Content-Type': 'application/json'
}
diff --git a/src/assets/images/map-pages/icon/toolbox/cross.png b/src/assets/images/map-pages/icon/toolbox/cross.png
new file mode 100644
index 0000000..a7e8175
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/cross.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/fullscreen.png b/src/assets/images/map-pages/icon/toolbox/fullscreen.png
new file mode 100644
index 0000000..bf6d1e0
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/fullscreen.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/vertical.png b/src/assets/images/map-pages/icon/toolbox/vertical.png
new file mode 100644
index 0000000..7eb3be5
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/vertical.png
Binary files differ
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
index af89683..1ab150f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
@@ -10,6 +10,7 @@
<script>
export default {
name: 'EchartsTab',
+ props: ['displayContent'],
data () {
return {}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
index ebf7ddd..a4c6dbd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
@@ -46,6 +46,7 @@
.main-matter{
font-size: 13px;
font-weight: normal;
+ padding: 10px 6px;
border: 1px solid #396d83;
.row-item-one{
margin-bottom: 7px;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
index 93776b0..9519388 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
@@ -28,10 +28,9 @@
background-color: rgba(33, 41, 69,0.9);
}
.main {
- width: 100%;
- height: 100%;
+ border: 1px solid #396d83;
+ padding: 6px;
.main-video {
- //border: 1px solid #396d83;
width: 100%;
height: 100%;
video {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index b9fae10..8f4e691 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -1,20 +1,26 @@
<template>
- <div class="public-table">
- <el-col class="el-col">
- <el-table
- border
- tooltip-effect="dark"
- :data="data"
- >
- <el-table-column prop="name" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" label="绫诲埆"></el-table-column>
- <el-table-column prop="date" label="鍥哄簾鍚嶇О"></el-table-column>
- <el-table-column prop="address" label="浠ｇ爜"></el-table-column>
- <el-table-column prop="address" label="浜х敓閲�"></el-table-column>
- <el-table-column prop="name" label="鍌ㄥ瓨閲�"></el-table-column>
- <el-table-column prop="date" label="浜х敓瑁呯疆"></el-table-column>
- </el-table>
- </el-col>
+ <div class="win">
+ <!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
+ <div class="border_corner border_corner_left_top"></div>
+ <div class="border_corner border_corner_right_top"></div>
+ <div class="border_corner border_corner_left_bottom"></div>
+ <div class="border_corner border_corner_right_bottom"></div>
+ <div class="main">
+ <div class="main-video">
+ <el-table
+ tooltip-effect="dark"
+ :data="data"
+ >
+ <el-table-column prop="name" label="搴忓彿"></el-table-column>
+ <el-table-column prop="name" label="绫诲埆"></el-table-column>
+ <el-table-column prop="date" label="鍥哄簾鍚嶇О"></el-table-column>
+ <el-table-column prop="address" label="浠ｇ爜"></el-table-column>
+ <el-table-column prop="address" label="浜х敓閲�"></el-table-column>
+ <el-table-column prop="name" label="鍌ㄥ瓨閲�"></el-table-column>
+ <el-table-column prop="date" label="浜х敓瑁呯疆"></el-table-column>
+ </el-table>
+ </div>
+ </div>
</div>
</template>
@@ -24,7 +30,15 @@
props: ['requestSolidWasteData'],
data () {
return {
- data: []
+ data: [{
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖�'
+ }, {
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖�'
+ }]
}
},
mounted () {
@@ -42,7 +56,63 @@
</script>
<style lang="less" scoped>
-.public-table {
+.win {
+ position: relative;
+ background-color: rgba(33, 41, 69, 0.9);
+}
+.main {
+ width: 100%;
+ height: 100%;
+ //padding: 10px 6px;
+ //border: 1px solid #396d83;
+ .main-video {
+ //border: 1px solid #396d83;
+ width: 100%;
+ min-height: 165px;
+
+ video {
+ width: 100%;
+ height: 100%;
+ outline: none;
+ }
+ }
+}
+
+.border_corner {
+ z-index: 999;
+ position: absolute;
+ width: 14px;
+ height: 14px;
+ background: rgba(0, 0, 0, 0);
+ border: 1.5px solid #47d5ea;
+}
+
+.border_corner_left_top {
+ top: 0;
+ left: 0;
+ border-right: none;
+ border-bottom: none;
+}
+
+.border_corner_right_top {
+ top: 0;
+ right: 0;
+ border-left: none;
+ border-bottom: none;
+}
+
+.border_corner_left_bottom {
+ bottom: 0;
+ left: 0;
+ border-right: none;
+ border-top: none;
+}
+
+.border_corner_right_bottom {
+ bottom: 0;
+ right: 0;
+ border-left: none;
+ border-top: none;
}
</style>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 573a156..c766b58 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<template>
- <div class="public-bounced" v-if="flag">
+ <div class="public-bounced" v-draw v-if="flag">
<div class="public-bounced-title">
<span>{{ displayContent.Name }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,11 +7,11 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<GasTab :displayContent="displayContent"></GasTab>
-<!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
-<!-- <GasECharts></GasECharts>-->
<GasTabs></GasTabs>
- <!-- <PublicTable></PublicTable>-->
-<!-- <GasECharts></GasECharts>-->
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+ <GasECharts v-else></GasECharts>
+ </div>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -24,8 +24,8 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
-// import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
import GasTabs from './GasComponents/GasTabs'
@@ -34,6 +34,8 @@
components: {
GasTabs,
GasTab,
+ PublicTable,
+ GasECharts,
// PublicTable,
// GasECharts,
GasVideo
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index f4ff3f0..a9a51c9 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -19,9 +19,10 @@
layer: layer
})
const res = await mapApi.getCompany()
- console.log(res)
+ // console.log(res)
const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
+ // console.log(data[i])
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
const positionY = data[i].Longitude
@@ -32,7 +33,14 @@
iconUrl: iconUrl,
iconSize: [50, 50],
iconAnchor: [25, 25]
- })
+ }),
+ test: data[i]
+ })
+ marker.bindTooltip(data[i].name, {
+ permanent: true,
+ offset: [0, -16],
+ direction: 'top',
+ className: ''
})
layer.addLayer(marker)
@@ -40,20 +48,13 @@
}
this.bindTooltip = (layer) => {
- console.log(layer)
- return '浼佷笟'
+ // console.log(layer)
+ // return layer.options.test.name
}
- this.clickListener = (layer) => {
- /* this.animalService.pulseEffect(e.latlng)
+ this.clickListener = (e) => {
+ // this.animalService.pulseEffect(e.latlng)
console.log(e)
- return this.PublicBounced.$el
- */
- console.log(layer)
+ // return this.PublicBounced.$el
}
-
- // 鍥哄簾鐐瑰嚮杩涜鐨� 鍐呭鐨勮缃�
- // SetSolidWasteContent (config, containerPopup) {
- // this.SolidWastePopup = containerPopup
- // }
}
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index dd48fcc..e12ae43 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -52,6 +52,8 @@
this.clickListener = async (e) => {
this.animalService.pulseEffect(e.latlng)
+ // this.setPanTo(e.latlng, 200)
+ console.log(e)
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
@@ -59,11 +61,20 @@
// console.log(result)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(result, 'gufei')
instance.$mount()
document.body.appendChild(instance.$el)
+ instance.setData(result, 'gufei')
}
+ // panTo
+ // this.setPanTo = (pos, value) => {
+ // var position = pos
+ // position = this.map.latLngToLayerPoint(position)
+ // position.y += value
+ // position = this.map.layerPointToLatLng(position)
+ // this.map.flyTo(position)
+ // }
+
// 涓嶅悓绫诲瀷鍥剧墖灏佽
this.differentTypes = (judgeValue) => {
var effectOfChange
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bf0a41c..e120cfa 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -11,6 +11,7 @@
const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
+const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
@@ -43,14 +44,23 @@
this.bindTooltip = (layer) => {
console.log(layer)
- return '娴嬭瘯搴熸皵'
+ return '搴熸皵鐐�'
}
- this.clickListener = (e) => {
- console.log(e)
+ this.clickListener = async (e) => {
+ // console.log(e)
this.animalService.pulseEffect(e.latlng)
+ const dataValue = {
+ StoragePlaceId: e.layer.options.test.StoragePlaceId
+ }
+ const result = await mapApi.GetWasteGas(dataValue)
+ const PublicBounced = window.Vue.extend(publicBounced)
+ const instance = new PublicBounced()
+ instance.setData(result)
+ instance.$mount()
+ document.body.appendChild(instance.$el)
}
- // 涓嶅悓绫诲瀷鍥剧墖灏佽
+ // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
var effectOfChange
if (ContrLevel === 1) {
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 87ea4a7..01bfe83 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -6,8 +6,7 @@
<div class="wms-panel">
<div v-for="item in serviceLayers" :key="item.code" class="layerbox">
<div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
- @change="swAllLayers(item)"/>{{ item.name }} <span @click="swFilter(item)" v-if="item.childLayer"
- class="btn-filter">杩囨护</span>
+ @change="swAllLayers(item)"/>{{ item.name }}
</div>
<div class="layerbox-item">
<div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox"
@@ -66,9 +65,9 @@
swWmsLayer (itm) {
itm.checked = !itm.checked
if (itm.checked) {
- window.layerFactory.show(itm.code)
+ window.layerFactory.show(itm)
} else {
- window.layerFactory.hide(itm.code)
+ window.layerFactory.hide(itm)
}
// this.updateWms()
},
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index e7a585c..484d6e2 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -18,44 +18,55 @@
var layers = config.layers
for (var j = 0; j < layers.length; j++) {
var childConfig = layers[j]
- var code = childConfig.code
- var wfs = childConfig.wfs
- var wms = childConfig.wms
- var url = childConfig.url
- // 鍒ゆ柇鏄惁宸茬粡鍔犺浇杩囷紝鍔犺浇杩囧氨 鐩存帴寰楀埌瀵硅薄璋冪敤 鏄剧ず鍑芥暟
- var layer = this.layers[code]
- if (!layer) {
- layer = this.L.featureGroup({}).addTo(this.map)
- // 2. 鍒ゆ柇绫诲瀷
- if (wfs) {
- // 3. 瀹炰緥鍖栧叿浣搒ervice
- var wfsLayerService = new WfsLayerService(childConfig)
- wfsLayerService.init(layer)
- }
- if (wms) {
- var wmsLayerService = new WmsLayerService(childConfig)
- wmsLayerService.init(layer)
- }
- // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
- if (url) {
- var busiLayerService = new BusiLayerService(childConfig)
- busiLayerService.init(layer)
- }
- layer ? (this.layers[code] = layer) : console.log('LayerFactory锛歯ewLayer is null锛宲lease check !!!')
- } else {
- this.show(code)
- }
+ var checked = childConfig.checked
+ checked && this.load(childConfig)
}
}
}
- show (code) {
- var _layer = this.layers[code].addTo(this.map)
- this.setZIndex(_layer)
+ load (config) {
+ var code = config.code
+ var wfs = config.wfs
+ var wms = config.wms
+ var url = config.url
+ // 鍒ゆ柇鏄惁宸茬粡鍔犺浇杩囷紝鍔犺浇杩囧氨 鐩存帴寰楀埌瀵硅薄璋冪敤 鏄剧ず鍑芥暟
+ var layer = this.layers[code]
+ if (!layer) {
+ layer = this.L.featureGroup({}).addTo(this.map)
+ // 2. 鍒ゆ柇绫诲瀷
+ if (wfs) {
+ // 3. 瀹炰緥鍖栧叿浣搒ervice
+ var wfsLayerService = new WfsLayerService(config)
+ wfsLayerService.init(layer)
+ this.setZIndex(layer)
+ }
+ if (wms) {
+ var wmsLayerService = new WmsLayerService(config)
+ wmsLayerService.init(layer)
+ }
+ // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
+ if (url) {
+ var busiLayerService = new BusiLayerService(config)
+ busiLayerService.init(layer)
+ }
+ layer ? (this.layers[code] = layer) : console.log('LayerFactory锛歯ewLayer is null锛宲lease check !!!')
+ } else {
+ this.show(code)
+ }
}
- hide (code) {
- var layer = this.layers[code]
+ show (config) {
+ var layer = this.layers[config.code]
+ if (layer) {
+ layer.addTo(this.map)
+ this.setZIndex(layer)
+ } else {
+ this.load(config)
+ }
+ }
+
+ hide (config) {
+ var layer = this.layers[config.code]
layer && this.map.removeLayer(layer)
}
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 0e88c14..62a5442 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,5 +1,5 @@
<template>
- <div class="left-top-toolbox-panel">
+ <div class="left-top-toolbox-panel" v-if="toolBoxPanelVisible">
<div class="specific-tools">
<el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"
@mouseover.enter.native="changeSelectMouse">
@@ -9,17 +9,19 @@
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
<el-popover
+ trigger="manual"
placement="bottom"
- trigger="click"
:popper-class="'tools-panel-content'"
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
+ v-model="isShow[index]"
>
- <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
- @click="changeChoose(index)">
- <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
+ <el-button slot="reference" class="el-button"
+ :class="active === index? 'tools-panel-choose':''"
+ @click.native="changeChoose(index)">
+ <img :src="item.iconSelecd" alt="" v-if="active === index"/>
<img :src="item.icon" alt="" v-else/>
- <span v-if="active === index && checked">{{ item.label }}</span>
+ <span v-if="active === index">{{ item.label }}</span>
<span v-else class="default-span">{{ item.label }}</span>
</el-button>
<el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
@@ -28,7 +30,7 @@
<img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
</el-button>
<div class="base-map-inner-panel" v-show="item.index==='2'">
- <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
+ <div v-for="item in basemapHelper.basemapList" :key="item.code" class="basemap-layer-item">
<img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
@click="changeBasemap(item)" alt=""/>
<el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
@@ -83,6 +85,11 @@
import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
+// 涓嬭浇
+import FullScreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
+import cross from '@assets/images/map-pages/icon/toolbox/cross.png'
+import vertical from '@assets/images/map-pages/icon/toolbox/vertical.png'
+
// 娴嬮噺鐨勬柟娉�
import Measure from '@/components/plugin/MeaSure'
@@ -90,10 +97,11 @@
name: 'ToolBoxPanel',
data () {
return {
- isShow: false,
+ isShow: [],
currentBaseMapCode: 'tianditu_img',
basemapList: [],
selectGroup: false,
+ toolBoxPanelVisible: false,
drawLayer: null,
drawLayerArray: [],
map: null,
@@ -230,19 +238,19 @@
{
index: '4-1',
label: '鍏ㄥ睆',
- icon: '',
+ icon: FullScreen,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
- icon: '',
+ icon: cross,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
- icon: '',
+ icon: vertical,
title: 'A4绾靛悜'
}
]
@@ -255,24 +263,16 @@
return this.$store.state.map.basemapHelper
}
},
- watch: {
- basemapHelper (newVal) {
- if (newVal != null) {
- this.updateBasemapList()
- }
- }
- },
methods: {
- updateBasemapList () {
- this.basemapList = this.basemapHelper.getBasemapList()
- console.log()
+ init (map) {
+ this.map = map
+ this.toolBoxPanelVisible = true
},
changeBasemap (itm) {
this.active = -1
const code = itm.code
- this.basemapList.forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
if (item.code === code) {
- console.log(this.currentBaseMapCode)
if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
this.currentBaseMapCode = code
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
@@ -280,7 +280,7 @@
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
}
- this.basemapHelper.getBasemapList().forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
item.layer.bringToBack()
})
}
@@ -291,17 +291,25 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
- if (this.checkbutton === index) {
- this.checked = !this.checked
- this.Selecd = -1
- } else {
- if (this.checkbutton === -1) {
- this.checked = !this.checked
- } else {
- this.checked = true
- }
+ // this.isShow[index] = !this.isShow[index]
+ // this.isShow[index - 1] = !this.isShow[index - 1]
+ // if (this.checkbutton === index) {
+ // this.checked = !this.checked
+ // this.Selecd = -1
+ // } else {
+ // if (this.checkbutton === -1) {
+ // this.checked = !this.checked
+ // } else {
+ // this.checked = true
+ // }
+ // }
+ // this.checkbutton = index
+ // console.log(this.isShow[index - 1])
+ console.log(this.basemapList)
+ for (let i = 0; i < this.isShow.length; i++) {
+ this.isShow[i] = false
}
- this.checkbutton = index
+ this.isShow[index] = true
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
@@ -407,6 +415,7 @@
},
changeSelectMouse () {
this.selectGroup = true
+ this.isShow = []
}
}
}
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 92212b0..455d6e2 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -5,13 +5,10 @@
}
export const logicMapper = {
- // fsqy: 'Sample.js',
- fspfk: 'Sample.js',
- fsjcd: 'Sample.js',
wasteGasJcd: 'WasteGas.js',
wasteWaterJcd: 'WasteWater.js',
solidWasteJcd: 'SolidWaste.js',
- fsqy: 'Company.js'
+ sewersAreaGs: 'Company.js'
}
export const props = {
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index ea8b7fb..ef799e2 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -7,6 +7,8 @@
import { LayerPipeLine } from './layers/LayerPipeLine'
import { LayerArea } from './layers/LayerArea'
import { LayerPk } from './layers/LayerPk'
+import { LayerFsss } from './layers/LayerFsss'
+import { LayerHbss } from './layers/LayerHbss'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -46,7 +48,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerPipeLine, LayerArea, LayerPk, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
+ LayerSewersLine: [LayerPipeLine, LayerFsss, LayerHbss, LayerArea, LayerPk, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
layerSewersPoint: LayerSewersPoint
} // 姹￠洦姘村浘灞傞厤缃�
}
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index b4dd2b9..4365756 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -1,6 +1,8 @@
/**
* 鍖哄煙
*/
+const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
+const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
export const LayerArea = {
code: 'sewersArea',
name: '鍖哄煙淇℃伅',
@@ -11,7 +13,7 @@
name: '鍏徃',
sname: '鍏徃', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
- url: '?TYPENAME=绠＄綉',
+ url: WFS_URL + '?TYPENAME=鍏徃',
minZoom: 10, // 鍦ㄦ寚瀹氱骇鍒樉绀�
childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
},
@@ -20,7 +22,7 @@
name: '鐮佸ご',
sname: '鐮佸ご',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: '?TYPENAME=鍚补姹℃按',
+ wfs: WFS_URL + '?TYPENAME=鐮佸ご',
minZoom: 10,
childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
},
@@ -29,7 +31,7 @@
name: '瑁呯疆鍖�',
sname: '瑁呯疆鍖�',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: '?TYPENAME=鍚洂姹℃按',
+ wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
minZoom: 10
}
]
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index c77b633..d5193d2 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -3,77 +3,68 @@
*/
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
-export const LayerFsss = {
- code: 'sewersFsss',
+export const LayerHbss = {
+ code: 'sewersHbss',
name: '鐜繚璁炬柦',
checked: false, // 榛樿閫変腑鐘舵��
layers: [
{
- code: 'fourlink',
- name: '鍥涢��',
- sname: '鍥涢��',
+ code: 'yj',
+ name: '绐ㄤ簳',
+ sname: '绐ㄤ簳',
checked: true,
minZoom: 10,
- wfs: WFS_URL + '?TYPENAME=鍥涢��',
+ wfs: WFS_URL + '?TYPENAME=绐ㄤ簳',
icon: 'sewers/鍥涢��.png'
},
{
- code: 'tee',
- name: '涓夐��',
- sname: '涓夐��',
+ code: 'ybz',
+ name: '闆ㄧ瀛�',
+ sname: '闆ㄧ瀛�',
checked: false,
minZoom: 10,
- wfs: WFS_URL + '?TYPENAME=涓夐��',
+ wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
icon: 'sewers/涓夐��.png'
},
{
- code: 'piperack',
- name: '绠℃灦(澧�)',
- sname: 'PipeRack',
+ code: 'fht',
+ name: '闃茬伀鍫�',
+ sname: '闃茬伀鍫�',
minZoom: 10,
- wfs: WFS_URL + '?TYPENAME=绠℃灦',
+ wfs: WFS_URL + '?TYPENAME=闃茬伀鍫�',
checked: false
},
{
- code: 'pipegallery',
- name: '绠″粖(甯�)',
- sname: 'PipeGallery',
+ code: 'jsc',
+ name: '闆嗘按姹�',
+ sname: '闆嗘按姹�',
minZoom: 10,
- wfs: WFS_URL + '?TYPENAME=绠″粖',
+ wfs: WFS_URL + '?TYPENAME=闆嗘按姹�',
checked: false
},
{
- code: 'pipesegment',
- name: '娴佸悜',
- sname: 'ywslx',
- wfs: WFS_URL + '?TYPENAME=娴佸悜',
+ code: 'jlz',
+ name: '鎴祦闂�',
+ sname: '鎴祦闂�',
+ wfs: WFS_URL + '?TYPENAME=鎴祦闂�',
checked: false
},
{
- code: 'pipeline',
- name: '绠＄綉',
+ code: 'yly',
+ name: '婧㈡祦鍫�',
+ sname: '婧㈡祦鍫�',
minZoom: 10,
- sname: 'pipeline',
- wfs: WFS_URL + '?TYPENAME=绠＄綉',
+ wfs: WFS_URL + '?TYPENAME=婧㈡祦鍫�',
checked: false
},
{
- code: 'valve',
- name: '闃�闂�',
+ code: 'gyd',
+ name: '闅旀补姹�',
+ sname: '闅旀补姹�',
minZoom: 10,
- sname: 'valve',
checked: false,
- wfs: WFS_URL + '?TYPENAME=闃�闂�',
+ wfs: WFS_URL + '?TYPENAME=闅旀补姹�',
icon: 'sewers/闃�闂�.png'
- },
- {
- code: 'elbow',
- name: '寮ご',
- sname: 'Elbow',
- minZoom: 10,
- checked: false,
- wfs: WFS_URL + '?TYPENAME=寮ご',
- icon: 'sewers/寮ご.png'
}
]
}
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index ab13cdf..62bbee9 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -1,6 +1,8 @@
/**
* 鎺掑彛
*/
+const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
+const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
export const LayerPk = {
code: 'sewersPk',
name: '鎺掑彛',
@@ -11,7 +13,7 @@
name: '鍐呮帓鍙�',
sname: '鍐呮帓鍙�',
checked: true,
- wfs: '?TYPENAME=绠＄綉',
+ wfs: WFS_URL + '?TYPENAME=鍐呮帓鍙�',
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
{
@@ -19,7 +21,7 @@
name: '澶栨帓鍙�',
sname: '澶栨帓鍙�',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: '?TYPENAME=浜嬫晠姘�',
+ wfs: WFS_URL + '?TYPENAME=澶栨帓鍙�',
minZoom: 10
}
]
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e3e491d..ce51726 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -39,7 +39,7 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+
import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// // 鍏叡灞曠ず鏁版嵁
@@ -68,7 +68,8 @@
lcServiceLayerVisible: false,
basemapHelper: {},
serviceLayerHelper: {},
- vectorLayerHelper: {}
+ vectorLayerHelper: {},
+ toolBoxVisible: false
}
},
computed: {
@@ -82,18 +83,6 @@
})
},
methods: {
- ChangeState () {
- const data = {
- companyId: 3900100145,
- userCode: 'wenchun.deng',
- name: '',
- marginWarr: '',
- longDayWarr: ''
- }
- const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
- AddSolidWaste.requestData(data)
- AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
- },
AddGasHelper () {
const data = {
companyId: 3900100145,
@@ -144,7 +133,6 @@
init () {
const mapcontainer = this.$refs.rootmap
this.map = Sgis.initMap(mapcontainer)
- this.$refs.toolBox.map = this.map
window.popupComp = this.$refs.popup
var layerFactory = new LayerFactory({
@@ -164,10 +152,10 @@
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
this.vectorLayerHelper.initVectorLayers(this.config)
- this.ChangeState()
+ // this.ChangeState()
// this.AddGasHelper()
// this.ChangeWaterState()
-
+ this.$refs.toolBox.init(this.map)
this.saveMapStatus()
// this.setMapObj(this.mapObj)
// this.setBasemapHelper(this.basemapHelper)
--
Gitblit v1.8.0