From c90036e2b71f394711117f186a772758abe69e3a Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期三, 19 六月 2024 09:48:10 +0800
Subject: [PATCH] 更新
---
src/assets/img/new/logo.png | 0
src/components/map/viewer.vue | 148 ++---------------------
static/layers.json | 101 +---------------
src/components/index.vue | 82 -------------
4 files changed, 29 insertions(+), 302 deletions(-)
diff --git a/src/assets/img/new/logo.png b/src/assets/img/new/logo.png
new file mode 100644
index 0000000..7a68c80
--- /dev/null
+++ b/src/assets/img/new/logo.png
Binary files differ
diff --git a/src/components/index.vue b/src/components/index.vue
index 25748a1..f7b2a3f 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -1,8 +1,8 @@
<template>
<div class="mapViewer">
<leftpanel ref="Left" v-show="false" />
- <!-- <bottommenu /> -->
<viewer class="mapViewer" />
+ <!-- <img id="headlog" src="@/assets/img/new/logo.png" /> -->
</div>
</template>
@@ -66,83 +66,9 @@
height: 100%;
}
#headlog {
- width: 965px;
- height: 70px;
+ width: 500px;
position: absolute;
- left: 50%;
- top: 0;
- transform: translate(-50%, 0);
-}
-#bottomBar {
- width: 1357px;
- height: 52px;
- position: absolute;
- left: 50%;
- bottom: 0;
- transform: translate(-50%, 0);
-}
-.trigger {
- pointer-events: all;
-}
-
-.controlPanel {
- position: absolute;
- left: 0px;
- top: 0px;
- pointer-events: none;
-}
-
-.tooltip {
- position: absolute;
- z-index: 999999;
- color: white;
- width: 100%;
- top: 30px;
- margin: 0 auto;
- font-size: 24px;
- pointer-events: none;
- text-align: center;
- height: 60px;
- transition: all 0.2s linear;
-}
-
-.tooltiphide {
- opacity: 0;
- height: 0px !important;
-}
-
-.tooltip span {
- background-color: rgba(0, 0, 0, 0.6);
- border-radius: 10px;
- padding: 10px 30px;
-}
-.hisbox {
- position: absolute;
- z-index: 10000002;
- width: 100%;
- height: 100%;
- background-color: #fff;
-}
-.btnbox {
- position: absolute;
- z-index: 100000003;
- right: 30px;
-}
-.btnbox .el-button {
- padding: 0 !important;
- font-size: 24px;
- border: unset;
- float: unset;
- display: block;
- background: transparent;
- width: 48px;
- height: 48px;
- border-radius: 50%;
- margin: 1px;
- margin: 20px 0;
-}
-
-.searchBtn {
- width: 40px;
+ left: 20px;
+ top: 20px;
}
</style>
diff --git a/src/components/map/viewer.vue b/src/components/map/viewer.vue
index 3a5cb8a..83f7445 100644
--- a/src/components/map/viewer.vue
+++ b/src/components/map/viewer.vue
@@ -1,9 +1,6 @@
<template>
<div>
<div id="sdkContainer"></div>
- <!-- <div style="z-index: 30;position: absolute; top:1%;left: 1%;">
- <el-button @click="setLocation(3)">婕父</el-button>
- </div> -->
</div>
</template>
@@ -47,81 +44,34 @@
...mapState(["cesiumInit"]),
},
mounted() {
-
this.$nextTick(function () {
let that = this;
- let option = {
- fullscreenButton: true,
- licenseServer: "http://183.162.245.49:18080",
- minViewHeight: parseFloat(common.minviewheight),
- url: SmartEarthRootUrl + "Workers/image/earth.jpg", //涓嶅惈鍗曞紶鍦板浘鍥剧墖url鍒欎娇鐢ㄥ湪绾垮湴鍥�
- contextOptions: {
- failIfMajorPerformanceCaveat: false,
- webgl: {
- alpha: true,
- preserveDrawingBuffer: true,
- },
- },
- };
+
window.sgworld = new SmartEarth.SGWorld(
"sdkContainer",
Cesium,
- option,
-
+ {
+ fullscreenButton: true,
+ minViewHeight: parseFloat(common.minviewheight),
+ url: SmartEarthRootUrl + "Workers/image/earth.jpg", //涓嶅惈鍗曞紶鍦板浘鍥剧墖url鍒欎娇鐢ㄥ湪绾垮湴鍥�
+ contextOptions: {
+ failIfMajorPerformanceCaveat: false,
+ webgl: {
+ alpha: true,
+ preserveDrawingBuffer: true,
+ },
+ },
+ },
null,
() => {
- // sgworld.Navigate.flyToPointsInterest({
- // destination: Cesium.Cartesian3.fromDegrees(
- // 116.55341,
- // 39.72163,
- // 50000.83
- // ),
- // orientation: {
- // heading: Cesium.Math.toRadians(0),
- // pitch: Cesium.Math.toRadians(-90),
- // roll: Cesium.Math.toRadians(0.0)
- // },
- // duration: 7 //椋炶鏃堕棿8s
- // });
- // sgworld._Viewer.imageryLayers.removeAll();
- // 鍏堥鍒颁害搴勮鏀垮尯
- // setTimeout(() => {
sgworld.Navigate.flyToPointsInterest({
destination: Cesium.Cartesian3.fromDegrees(
116.540659,
- 39.744945,
- 50000
+ 39.734945,
+ 45000
),
- duration: 7, //椋炶鏃堕棿8s
+ duration: 5, //椋炶鏃堕棿8s
});
- // }, 5000);
- // setTimeout(() => {
- // sgworld.Navigate.flyToPointsInterest({
- // destination: Cesium.Cartesian3.fromDegrees(
- // 116.502368,
- // 39.791361,
- // 6500
- // ),
- // duration: 8, //椋炶鏃堕棿8s
- // });
- // }, 10000);
- setTimeout(() => {
- sgworld.Navigate.flyToPointsInterest({
- destination: {
- "x": -2187108.231948378,
- "y": 4392040.442348233,
- "z": 4063265.829085007
- },
- orientation: {
- heading: 2.4384163743219607,
- pitch: -0.32733173444759833,
- roll: 6.283095595698651,
- },
- duration: 10, //椋炶鏃堕棿8s
- });
- }, 10000);
- that.setCesiumInit(true);
- // rpc.initRpc();
}
);
@@ -190,7 +140,7 @@
methods: {
...mapMutations(["setCesiumInit"]),
setLocation(res) {
- rpc.setLocation(res)
+ rpc.setLocation(res);
},
detectZoom() {
var ratio = 0,
@@ -295,69 +245,5 @@
<style scoped>
-#bottomInfo {
- position: absolute;
- bottom: 0;
- width: 100%;
- height: 28px;
- background: rgba(0, 0, 0, 0.27);
-}
-#distanceLegendDiv {
- display: none !important;
-}
-
-#switchImagerLayer {
- display: block;
- position: absolute;
- /*bottom: 120px;*/
- bottom: 13px;
- right: 46px;
- /* margin-right: -105px; */
- z-index: 9999;
- border-radius: 10px;
- /* box-shadow: 0px 0px 5px 3px #fff; */
-}
-
-/* #switchImagerLayer:before {
- content: "";
- position: absolute;
- right: 5px;
- bottom: 10px;
- border: 13px solid rgba(0, 0, 0, 0.5);
- border-top-color: transparent;
- border-left-color: transparent;
-}
-
-#switchImagerLayer:after {
- content: "";
- width: 5px;
- height: 12px;
- position: absolute;
- right: 8px;
- bottom: 10px;
- border: 2px solid #fff;
- border-top-color: transparent;
- border-left-color: transparent;
- transform: rotate(45deg);
-} */
-
-.swichImg {
- width: 117px;
- height: 80px;
- border-radius: 10px;
- cursor: pointer;
-}
-.bgbox {
- position: absolute;
- top: 0;
- left: 8px;
- z-index: -1;
-}
-.mid {
- position: absolute;
- top: 50%;
- transform: translateY(-50%);
- right: 20%;
-}
</style>
\ No newline at end of file
diff --git a/static/layers.json b/static/layers.json
index 00f4ecc..8181d2c 100644
--- a/static/layers.json
+++ b/static/layers.json
@@ -8,50 +8,12 @@
"name": "瑙勮嚜鍒嗗眬",
"children": [
{
- "id": "18B25A94",
- "sourceType": "wmse",
- "name": "60骞虫柟鍏噷鏍稿績鍖虹晫",
- "urls": "https://10.10.4.116/gisserver/wmsserver/YZ_BJ60",
- "maximumLevel": 26,
- "alpha": 1,
- "zIndex": 7,
- "Level": "11,20",
- "checked": false,
- "rename": false,
- "flyTo": [
- "116.51352",
- "39.76102",
- "30523.31",
- "360.0",
- "-89.8"
- ]
- },
- {
- "id": "47EC9636",
- "sourceType": "wmse",
- "name": "225骞虫柟鍏噷鍖虹晫",
- "urls": "https://10.10.4.116/gisserver/wmsserver/YZ_BJ",
- "maximumLevel": 26,
- "alpha": 1,
- "zIndex": 7,
- "Level": "10,20",
- "flyTo": [
- "116.50281",
- "39.75291",
- "35307.96",
- "0.0",
- "-89.8"
- ],
- "checked": false,
- "rename": false
- },
- {
"id": "zhengwufuwuzhongxin",
"sourceType": "wfs",
"alpha": 1,
"name": "缁忓紑鍖烘斂鍔℃湇鍔′腑蹇� ",
"class": "point",
- "urls": "https://10.10.4.116/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+ "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
"layer": "缁忓紑鍖烘斂鍔℃湇鍔′腑蹇�",
"text": "[MCJC]",
"height": 50,
@@ -79,7 +41,7 @@
"alpha": 1,
"name": "琛楅亾鏀垮姟鏈嶅姟涓績",
"class": "point",
- "urls": "https://10.10.4.116/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+ "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
"layer": "琛楅亾鏀垮姟鏈嶅姟涓績",
"text": "[MCJC]",
"height": 50,
@@ -107,7 +69,7 @@
"alpha": 1,
"name": "浜︿紒鏈嶅姟娓� ",
"class": "point",
- "urls": "https://10.10.4.116/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+ "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
"layer": "浜︿紒鏈嶅姟娓�",
"text": "[MCJC]",
"height": 50,
@@ -135,7 +97,7 @@
"alpha": 1,
"name": "鍥尯鏈嶅姟绔� ",
"class": "point",
- "urls": "https://10.10.4.116/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+ "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
"layer": "鍥尯鏈嶅姟绔�",
"text": "[MCJC]",
"height": 50,
@@ -163,7 +125,7 @@
"alpha": 1,
"name": "绀惧尯鏈嶅姟绔� ",
"class": "point",
- "urls": "https://10.10.4.116/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+ "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
"layer": "绀惧尯鏈嶅姟绔�",
"text": "[MCJC]",
"height": 50,
@@ -183,21 +145,6 @@
"imageScale": 0.5,
"disableDepthTestDistance": "Infinity",
"checked": true,
- "rename": false
- },
- {
- "id": "chengshiguihua_xiangmumingcheng_tms",
- "name": "浜﹀簞鏂板煄瑙勫垝鍥�",
- "sourceType": "local-map",
- "urls": "https://10.10.4.116/gisserver/tmsserver/chengshiguihua_xiangmumingcheng_tms",
- "tile": "{z}/{x}/{y}",
- "tileType": "Mercator",
- "img": "jpeg",
- "tms": true,
- "Level": 1,
- "alpha": 0.75,
- "zIndex": 7,
- "checked": false,
"rename": false
}
],
@@ -225,38 +172,6 @@
"zIndex": 1,
"checked": true,
"rename": false
- },
- {
- "id": "A6D6DE13",
- "sourceType": "gdmap",
- "name": "楂樺痉褰卞儚",
- "urls": "https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}",
- "layer": "",
- "alpha": 1,
- "zIndex": 2,
- "maximumLevel": 18,
- "Level": [
- 0,
- 26
- ],
- "checked": false,
- "rename": false
- },
- {
- "id": "26B6815E",
- "sourceType": "gdmap",
- "name": "楂樺痉娉ㄨ",
- "zIndex": 2,
- "urls": "https://webst02.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}",
- "layer": "",
- "alpha": 1,
- "maximumLevel": 18,
- "Level": [
- 0,
- 26
- ],
- "checked": false,
- "rename": false
}
],
"rename": false,
@@ -272,7 +187,7 @@
"name": "鏍稿績鍖哄缓绛戠墿",
"sourceType": "b3dm",
"checked": true,
- "urls": "https://10.10.4.116/gisserver/c3dserver/hxq0609/tileset.json",
+ "urls": "http://10.10.4.121:8070/gisserver/c3dserver/hxq0609/tileset.json",
"rename": false,
"height": 0,
"zIndex": 1
@@ -282,7 +197,7 @@
"name": "225瀹炴櫙涓夌淮鏍稿績鍖哄湴闈�",
"sourceType": "b3dm",
"checked": true,
- "urls": "https://10.10.4.116/gisserver/c3dserver/hexinqudimian/tileset.json",
+ "urls": "http://10.10.4.121:8070/gisserver/c3dserver/hexinqudimian/tileset.json",
"rename": false,
"height": 0,
"zIndex": 1
@@ -293,7 +208,7 @@
"checked": true,
"sourceType": "b3dm",
"height": 0,
- "urls": "https://10.10.4.116/gisserver/c3dserver/fhx/tileset.json",
+ "urls": "http://10.10.4.121:8070/gisserver/c3dserver/fhx/tileset.json",
"rename": false,
"zIndex": 1
}
--
Gitblit v1.9.3