From c92282ff76f3ff986b4798d0f95e9c3e61020ca7 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 12 四月 2021 17:03:41 +0800
Subject: [PATCH] 日期选择组件，elelct 组件样式修改。
---
src/views/MapTemplate.vue | 151 +++++++++++++++++++++++++++++++------------------
1 files changed, 95 insertions(+), 56 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index bde308c..2c80ca3 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -3,15 +3,19 @@
<popup ref="popup" @callPopup="callPopup"></popup>
<div id="map" ref="rootmap">
</div>
- <sgis-layer-controller :preset="'warningPreset'">
- <lc-basemap></lc-basemap>
- <!-- <div class="barline"></div>-->
- <lc-service-layer class="barline"></lc-service-layer>
- </sgis-layer-controller>
- <lc-service-layer-filter v-show="showServiceLayerFilter" ref="serviceLayerFilter"></lc-service-layer-filter>
+ <sgis-layer-controller></sgis-layer-controller>
<monitor-panel></monitor-panel>
- <top-enterprise-panel></top-enterprise-panel>
- <tool-box-panel></tool-box-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>
+ <!-- <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>
</div>
</template>
@@ -20,39 +24,45 @@
import Sgis from '@src/Sgis'
// import mapConfig from '@/conf/MapConfig'
import SgisLayerController from '@components/LayerController/LayerController'
-import LcBasemap from '@components/LayerController/modules/LcBaseMap'
-import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
-import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
import MonitorPanel from '@components/panel/RightSearchPanel'
-import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
+// import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
+import summarySheets from '@components/table/summarySheets.vue'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
import Popup from '@views/popup/Popup'
+// import MenuSpecial from '@components/panel/MenuTopic'
+import LegendPanel from '@components/panel/LegendPanel'
+// import Enterprise from '../components/table/enterprise'
+// // 鍏叡灞曠ず鏁版嵁
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import LayerFactory from '@components/LayerController/service/LayerFactory'
+
export default {
name: 'MapTemplate',
components: {
+ // Enterprise,
+ LegendPanel,
+ // MenuSpecial,
ToolBoxPanel,
- TopEnterprisePanel,
+ // TopEnterprisePanel,
SgisLayerController,
MonitorPanel,
- LcBasemap,
- LcServiceLayer,
- LcServiceLayerFilter,
- Popup
+ Popup,
+ summarySheets,
+ PublicBounced
},
data () {
return {
map: null,
+ lcServiceLayerVisible: false,
basemapHelper: {},
serviceLayerHelper: {},
- vectorLayerHelper: {}
+ vectorLayerHelper: {},
+ toolBoxVisible: false
}
},
computed: {
- showServiceLayerFilter () {
- return this.$store.state.map.showServiceLayerFilter
- },
- mapConfig () {
- return this.$store.state.map.mapConfig
+ config () {
+ return this.$store.state.map.config
}
},
beforeMount () {
@@ -62,54 +72,41 @@
},
methods: {
saveMapStatus () {
+ window.serviceLayerHelper = this.serviceLayerHelper
this.$store.commit('setMapObj', this.map)
this.$store.commit('setBasemapHelper', this.basemapHelper)
- this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper)
+ // this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper)
this.$store.commit('setVectorLayerHelper', this.vectorLayerHelper)
+
+ this.lcServiceLayerVisible = true
},
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({
+ L: window.L,
+ map: this.map
+ })
+ layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine)
+ layerFactory.init(this.$store.state.map.serviceLayers.layerSewersPoint)
+ window.layerFactory = layerFactory
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
- this.basemapHelper.initBasemap(this.mapConfig, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
-
- this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
- this.serviceLayerHelper.initServiceLayers(this.mapConfig)
-
+ this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
- this.vectorLayerHelper.initVectorLayers(this.mapConfig)
+ this.vectorLayerHelper.initVectorLayers(this.config)
+
+ // this.AddGasHelper()
+ // this.ChangeWaterState()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
// this.setBasemapHelper(this.basemapHelper)
// this.setServiceLayerHelper(this.serviceLayerHelper)
// this.setVectorLayerHelper(this.vectorLayerHelper)
- this.addMarker()
- },
- addMarker () {
- const L = this.L
- var icon = new L.Icon({
- iconUrl: 'assets/images/map/marker-icon.png',
- shadowUrl: 'assets/images/map/marker-shadow.png',
- iconSize: [25, 41],
- iconAnchor: [12, 41],
- popupAnchor: [1, -34],
- shadowSize: [41, 41]
- })
- var marker = L.marker([32.2221, 118.7843], {
- icon: icon
- }).addTo(this.map)
- .bindPopup(() => this.$refs.popup.$el, { className: 's-map-popup', minWidth: 300, closeButton: false, autoClose: false })
- .bindTooltip('瀛椾綋鍏夋檿鏁堟灉t.', {
- // permanent : true,
- offset: [0, 0], // 鍋忕Щ
- direction: 'right', // 鏀剧疆浣嶇疆
- // sticky:true,//鏄惁鏍囪鍦ㄧ偣涓婇潰
- className: 'anim-tooltip'// CSS鎺у埗
- })
-
- marker.on('popupopen', this.onLayerClick)
},
onLayerClick () {
this.$refs.popup.setShow()
@@ -122,6 +119,26 @@
</script>
<style lang="less">
+.flue-gas {
+ position: fixed;
+ top: 88px;
+ left: 180px;
+ z-index: 500;
+}
+
+.solid-waste {
+ position: absolute;
+ top: 88px;
+ left: 88px;
+ z-index: 999;
+}
+
+.Waste-water {
+ position: absolute;
+ top: 88px;
+ left: 280px;
+ z-index: 999;
+}
.full-screen {
width: 100%;
@@ -141,5 +158,27 @@
//background-color: #0661AE;
border-top: 1px solid #0661AE;
}
+
+ #map-btn {
+ position: fixed;
+ top: 20px;
+ left: 100px;
+ z-index: 9999;
+ }
+
+ .leaflet-custom-icon {
+ background: white;
+ }
+
+ .leaflet-marker-icon {
+ background: none;
+ }
+
+ #migic {
+ width: 48px;
+ height: 48px;
+ margin: -18px -20px;
+ z-index: 999;
+ }
}
-</style>>
+</style>
--
Gitblit v1.8.0