From 5e47738f99e307bab1c8a5ee9ecd96d8c7f4a968 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 08 Jan 2022 10:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilemap/index.vue | 89 +++++++++++++++++++++++++-------------------
1 files changed, 50 insertions(+), 39 deletions(-)
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 330280f..3edfe80 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -18,11 +18,11 @@
<!-- 大弹窗 -->
<mobilePopupOur :style="[bigPopup]" v-if="mBigPopup"></mobilePopupOur>
<!-- 测试-跳转位置 -->
- <mobileGoTo></mobileGoTo>
+ <!-- <mobileGoTo></mobileGoTo> -->
<!-- 实景窗口 -->
<mobilePanorama></mobilePanorama>
<!-- 盖住左下角 -->
- <div class="cover_mobileMap">智慧校园</div>
+ <div class="cover_mobileMap">智慧社区</div>
</div>
</template>
<script>
@@ -194,11 +194,10 @@
url: "https://webmap-tile.sf-express.com/MapTileService/rt?fetchtype=static&x={x}&y={y}&z={z}&project=sfmap&pic_size=256&pic_type=png8&data_name=361100&data_format=merged-dat&data_type=normal", // 行政区划
}
);
- viewer.addBaseLayer(baselayer, {
- iconUrl: "examples/images/icon/img.png",
- name: "影像",
- });
-
+ // viewer.addBaseLayer(baselayer, {
+ // iconUrl: "examples/images/icon/img.png",
+ // name: "影像",
+ // });
// eslint-disable-next-line camelcase
// const baselayer_shaded = DC.ImageryLayerFactory.createArcGisImageryLayer({
// url: "http://services.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer",
@@ -268,11 +267,11 @@
// if (height > 2000) {
// conBack(2000);
// }
- if (height < 500 && isSet) {
- conBack(500);
+ if (height < 0 && isSet) {
+ conBack(0);
}
- if (height > 6000 && isSet) {
- conBack(6000);
+ if (height > 4000 && isSet) {
+ conBack(4000);
}
});
@@ -325,6 +324,7 @@
const tileset = new that.DC.Tileset("/mx/tileset.json", {
luminanceAtZenith: 0.5,
});
+
tilesetLayer.addOverlay(tileset);
// tilesetLayer.show = false;
@@ -422,9 +422,9 @@
// );
// }
// });
- tilesetLayer["changesilhouetteBlue"] = () => {
- silhouetteBlue.selected = [];
- };
+ // tilesetLayer["changesilhouetteBlue"] = () => {
+ // silhouetteBlue.selected = [];
+ // };
// tilesetLayer.show = false;
//精细模型↑
@@ -462,8 +462,12 @@
// "19",
// ],
// });
- new that.DC.Namespace.Cesium.ArcGisMapServerImageryProvider({
- url: "http://arcgis.jxpskj.com:6080/arcgis/rest/services/PingXiang25DMapDN/MapServer",
+ // new that.DC.Namespace.Cesium.ArcGisMapServerImageryProvider({
+ // url: "http://arcgis.jxpskj.com:6080/arcgis/rest/services/PingXiang25DMapDN/MapServer",
+ // });
+ new that.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: "/wp/{z}/{x}/{y}.png",
+ fileExtension: "png",
});
return viewer.imageryLayers.addImageryProvider(provider);
};
@@ -473,7 +477,7 @@
let startPoint;
if (true) {
startPoint = () => {
- let doit2 = (int) => {
+ let doit2 = (int, h) => {
viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
@@ -487,18 +491,25 @@
),
orientation: {
// 指向
- heading: that.DC.Namespace.Cesium.Math.toRadians(108),
+ heading: that.DC.Namespace.Cesium.Math.toRadians(h[0]),
// 视角
- pitch: that.DC.Namespace.Cesium.Math.toRadians(-26.46),
- roll: 0.0,
+ pitch: that.DC.Namespace.Cesium.Math.toRadians(h[1]),
+ roll: h[2],
},
});
};
that.dimension == "2.5D"
- ? doit2([114.03928791, 27.62954732, 360.0])
+ ? doit2(
+ [114.03928791, 27.62954732, 360.0],
+ [
+ that.dimensionData.heading,
+ that.dimensionData.pitch,
+ that.dimensionData.roll,
+ ]
+ )
: // : doit([116.39038494750986, 39.902393222208644, 330.0]);
// doit("建模");
- doit2([114.0351, 27.6314, 300.0]);
+ doit2([114.0351, 27.6314, 300.0], [108, -26.46, 0.0]);
};
} else {
startPoint = (val) => {
@@ -571,29 +582,29 @@
//瀑布流↓
const wallLayer = new that.DC.VectorLayer("wallLayer");
- viewer.addLayer(wallLayer);
- var arr = that.wallArr;
- arr.forEach((item) => {
- item = item.join(",");
- });
- arr = arr.join(";");
- const wall = new that.DC.Wall(arr);
- wall.setStyle({
- material: new that.DC.WallTrailMaterialProperty({
- color: that.DC.Namespace.Cesium.Color.fromBytes(0, 142, 255, 150),
- // color: that.DC.Color.DEEPSKYBLUE,
- speed: 4,
- }),
- });
- wallLayer.addOverlay(wall);
+ // viewer.addLayer(wallLayer);
+ // var arr = that.wallArr;
+ // arr.forEach((item) => {
+ // item = item.join(",");
+ // });
+ // arr = arr.join(";");
+ // const wall = new that.DC.Wall(arr);
+ // wall.setStyle({
+ // material: new that.DC.WallTrailMaterialProperty({
+ // color: that.DC.Namespace.Cesium.Color.fromBytes(0, 142, 255, 150),
+ // // color: that.DC.Color.DEEPSKYBLUE,
+ // speed: 4,
+ // }),
+ // });
+ // wallLayer.addOverlay(wall);
- viewer.use(new that.DC.Measure());
+ // viewer.use(new that.DC.Measure());
//瀑布流↑
// 传入store
that.$store.commit("MSET_MODEOLS", {
tilesetLayer: tilesetLayer,
- tileset: tileset,
+ // tileset: tileset,
newLayer: newLayer,
wallLayer: wallLayer,
usetowpointfive: usetowpointfive,
--
Gitblit v1.9.3