From 4df0471b7dff0494625ff09969b1a13b5359a26e Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期一, 31 五月 2021 22:41:47 +0800
Subject: [PATCH] 统计表弹框UI优化；增加点击企业名称缩放至企业；二级表展示功能优化。
---
src/views/Temp.vue | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 13 deletions(-)
diff --git a/src/views/Temp.vue b/src/views/Temp.vue
index 4e3accf..d9afd42 100644
--- a/src/views/Temp.vue
+++ b/src/views/Temp.vue
@@ -15,7 +15,7 @@
<!-- <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>
+<!-- <PublicBounced ref="PublicBounced"></PublicBounced>-->
</div>
</template>
@@ -33,9 +33,16 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// // 鍏叡灞曠ず鏁版嵁
-import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+// import PublicBounced from '@components/base-page/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
-
+// import '../components/plugin/Leaflet.TileLayer.ProjWMTS'
+// import * as L from 'leaflet'
+// import * as L from 'leaflet'
+const esri = require('esri-leaflet')
+// const proj4 = require('proj4')
+const proj4 = require('proj4')
+window.proj4 = proj4
+const Proj = require('../components/plugin/proj4leaflet')
export default {
name: 'Temp',
components: {
@@ -47,8 +54,8 @@
SgisLayerController,
MonitorPanel,
Popup,
- summarySheets,
- PublicBounced
+ summarySheets
+ // PublicBounced
},
data () {
return {
@@ -82,7 +89,54 @@
},
init () {
const mapcontainer = this.$refs.rootmap
- this.map = Sgis.initMap(mapcontainer)
+ const CRS_4490 = new Proj.CRS('EPSG:4490', '+proj=longlat +ellps=GRS80 +no_defs', {
+ resolutions: [
+ // 1.40625,
+ 0.703125,
+ 0.3515625,
+ 0.17578125,
+ 0.087890625,
+ 0.0439453125,
+ 0.02197265625,
+ 0.010986328125,
+ 0.0054931640625,
+ 0.00274658203125,
+ 0.001373291015625,
+ 6.866455078125E-4,
+ 3.4332275390625E-4,
+ 1.71661376953125E-4,
+ 8.58306884765625E-5,
+ 4.291534423828125E-5,
+ 2.1457672119140625E-5,
+ 1.0728836059570312E-5,
+ 5.364418029785156E-6,
+ 2.682209064925356E-6,
+ 1.3411045324626732E-6
+ ],
+ origin: [-180, 90],
+ // origin: [-400.0, 399.9999999999998],//arcgis 鍧愭爣婧愮偣
+ bounds: this.L.bounds([-180, -90], [180, 90]) // 澶╁湴鍥�
+
+ })
+ console.log(mapcontainer)
+ console.log(CRS_4490)
+ const options = {
+ crs: CRS_4490,
+ // crs: this.L.CRS.EPSG4326,
+ minZoom: 3,
+ maxZoom: 21,
+ // center: [26, 104],
+ center: [32.23012597374691, 118.78516085275147],
+ // center: [29.454345703125, 113.40362548828125],
+ zoom: 3,
+ worldCopyJump: false,
+ inertia: true,
+ zoomControl: false,
+ attributionControl: false,
+ editable: true,
+ preferCanvas: true
+ }
+ this.map = Sgis.initMap(mapcontainer, options)
this.$refs.toolBox.map = this.map
window.popupComp = this.$refs.popup
@@ -106,6 +160,20 @@
// this.setBasemapHelper(this.basemapHelper)
// this.setServiceLayerHelper(this.serviceLayerHelper)
// this.setVectorLayerHelper(this.vectorLayerHelper)
+ this.loadArcgisImg()
+ },
+ loadArcgisImg () {
+ // const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-enterprise/MapServer/tile/{z}/{y}/{x}'
+ // const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-enterprise/MapServer'
+ const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-sinopec/MapServer'
+ // const arcgisTileLayer = this.L.tileLayer(url, {
+ const arcgisTileLayer = esri.tiledMapLayer({
+ url: url,
+ token: window.tdtToken,
+ zoomOffsetAllowance: 0.5
+ })
+ // const arcgisTileLayer = esri.dynamicMapLayer({ url: url, useCors: true })
+ arcgisTileLayer.addTo(this.map)
},
onLayerClick () {
this.$refs.popup.setShow()
@@ -129,13 +197,6 @@
position: absolute;
top: 88px;
left: 88px;
- z-index: 999;
-}
-
-.Waste-water {
- position: absolute;
- top: 88px;
- left: 280px;
z-index: 999;
}
--
Gitblit v1.8.0