From bf5ba56e8a82f0ef699f2eae413d0dc2c4e4f67d Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Tue, 25 Oct 2022 16:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/sd-jg-school-web into master
---
src/components/map/components/dimension.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index a156034..534c29b 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -1,15 +1,15 @@
<template>
<div class="dimension-cut">
<!-- <el-button type="primary">{{zoomValue}}</el-button> -->
- <!-- <el-radio-group
+ <el-radio-group
v-model="dimensionValue"
size="medium"
@change="dimensionChange"
ref="StateChange"
>
- <el-radio-button label="三 维"></el-radio-button>
- <el-radio-button label="真三维"></el-radio-button>
- </el-radio-group>-->
+ <!-- <el-radio-button label="三 维"></el-radio-button>
+ <el-radio-button label="真三维"></el-radio-button>-->
+ </el-radio-group>
</div>
</template>
@@ -46,8 +46,8 @@
const slLayer = null
const bzLayer = null
-let viewerHeight = 800
-let heightChange = 800
+let viewerHeight = 1000
+let heightChange = 1000
const mixVH = 300
const maxVH = 1000
@@ -56,6 +56,7 @@
const twoVH = 500
const fourVH = 800
const fiveVH = 1000
+const sixVH = 1500
const heightDifferenceValue = 100
@@ -100,7 +101,7 @@
[114.03954722, 27.62819644, 100],
[114.04006133, 27.628038, 100]
],
- mapCenter: [116.027429, 28.681978, 800]
+ mapCenter: [115.79647126999, 28.6421878133715, 1000]
// mapCenter: [116.35559028,
// 27.96548051, 5000]
// mapCenter: [115.871863, 28.743861, 950.0]
@@ -171,7 +172,7 @@
// })
global.viewer.imageryLayers.addImageryProvider(new global.DC.Namespace.Cesium.SingleTileImageryProvider({
- url: '/zhxy/img/bg/bg.png'
+ url: '/zhjg/img/bg/bg.png'
}))
silhouetteBlue =
@@ -263,6 +264,8 @@
// 最大
// global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = maxVH
// global.eagleViewer.scene.screenSpaceCameraController.maximumZoomDistance = maxVH + 1000
+ global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 3500
+ global.eagleViewer.scene.screenSpaceCameraController.maximumZoomDistance = 4500
// 设置相机缩小时的速率
// global.viewer.scene.screenSpaceCameraController._minimumZoomRate = 2000
@@ -740,7 +743,9 @@
// return
// }
- if (height > fiveVH - heightDifferenceValue) {
+ if (height > sixVH - heightDifferenceValue) {
+ viewerHeight = sixVH
+ } else if (height <= fiveVH + heightDifferenceValue && height > fiveVH - heightDifferenceValue) {
viewerHeight = fiveVH
} else if (height <= fourVH + heightDifferenceValue && height > fourVH - heightDifferenceValue) {
viewerHeight = fourVH
@@ -777,7 +782,7 @@
layerGroup.addLayer(DefaultAreaLayer)
axios
.get(
- 'https://dev.jxpskj.com:8023/arcgis/rest/services/shidalk/MapServer/0/query?where=1%3D1&text=&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&returnTrueCurves=false&resultOffset=&resultRecordCount=&f=pjson'
+ 'https://dev.jxpskj.com:8023/arcgis/rest/services/jglk/MapServer/0/query?where=1%3D1&text=&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&returnTrueCurves=false&resultOffset=&resultRecordCount=&f=pjson'
)
.then((resultData) => {
resultData.data.features.forEach((item) => {
@@ -898,7 +903,7 @@
qxTilesetLayer = new global.DC.TilesetLayer('qxTilesetLayer')
global.viewer.addLayer(qxTilesetLayer)
- qxTileset = new global.DC.Tileset('/zhxy/qx/tileset.json', {
+ qxTileset = new global.DC.Tileset('/zhjg/qx/tileset.json', {
luminanceAtZenith: 0.4,
// cullWithChildrenBounds: false,
// cullRequestsWhileMoving: false,
@@ -920,7 +925,7 @@
const that = this
tilesetLayer = new global.DC.TilesetLayer('tilesetLayer')
global.viewer.addLayer(tilesetLayer)
- tileset = new global.DC.Tileset('/zhxy/mx/tileset.json', {
+ tileset = new global.DC.Tileset('/zhjg/mx/tileset.json', {
luminanceAtZenith: 0.4,
// cullWithChildrenBounds: false,
// cullRequestsWhileMoving: false,
--
Gitblit v1.9.3