diff --git a/package.json b/package.json
index db879d6..471cdb3 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"jsencrypt": "^3.0.0-rc.1",
"leaflet": "^1.7.1",
"leaflet-draw": "^1.0.4",
- "mars3d": "^3.0.26",
+ "mars3d": "^3.0.30",
"mockjs": "1.0.1-beta3",
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
diff --git a/package.json b/package.json
index db879d6..471cdb3 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"jsencrypt": "^3.0.0-rc.1",
"leaflet": "^1.7.1",
"leaflet-draw": "^1.0.4",
- "mars3d": "^3.0.26",
+ "mars3d": "^3.0.30",
"mockjs": "1.0.1-beta3",
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 035afed..4214017 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -88,8 +88,11 @@
data() {
return {
map: null,
+ ysline: null,
+ wsline: null,
img_layer: null,
tile_layer: null,
+ tiles3dLayer: null,
rain_point_layer: null,
rain_point_layer1: null,
sewage_point_layer: null,
@@ -98,7 +101,7 @@
type: 'massMarkers', // 加载数据方式：massMarkers或cluster
refreshType: 'clock', // 刷新数据方式：clock或websocket
showAlarm: true, // 是否显示报警
- showAll: true, // 是否显示全部井
+ showAll: false, // 是否显示全部井
alpha: 100, // 是否显示全部井
listQuery: {
keywords: '', // 关键字
@@ -173,6 +176,17 @@
watch: {
alpha(val){
this.img_layer.alpha = val/100
+ this.map.basemap.opacity = val/100
+ this.tiles3dLayer.opacity = val/100
+ if(val<=10){
+ this.map.scene.globe.show = false
+ this.ysline.show = false
+ this.wsline.show = false
+ }else {
+ this.map.scene.globe.show = true
+ this.ysline.show = true
+ this.wsline.show = true
+ }
},
showAll(val) {
this.tile_layer.show = val
@@ -229,6 +243,10 @@
url: '../static/model/ws3(1).gltf',
scale: 1.3
},
+ callback: function (attr, styleOpt){
+ var val= {attr}.attr
+ return {setHeight: -val.井深}
+ }
},
popup: '编号：{编号}
名称：{附属物名称}
所属道路：{所属道路}',
})
@@ -245,6 +263,10 @@
url: '../static/model/ys3.gltf',
scale: 1.3
},
+ callback: function (attr, styleOpt){
+ var val= {attr}.attr
+ return {setHeight: -val.井深}
+ }
},
popup: '编号：{编号}
名称：{附属物名称}
所属道路：{所属道路}',
})
@@ -261,6 +283,10 @@
url: '../static/model/yubi.gltf',
scale: 1.3
},
+ callback: function (attr, styleOpt){
+ var val= {attr}.attr
+ return {setHeight: -val.井深}
+ }
},
popup: '编号：{编号}
名称：{附属物名称}
所属道路：{所属道路}',
})
@@ -274,9 +300,9 @@
center: { lat: 27.68, lng: 116.0935, alt: 10000, heading: 360, pitch: -45 },
// 以下是Cesium.Globe对象相关参数
globe: {
- depthTestAgainstTerrain: false, // 是否启用深度监测
+ depthTestAgainstTerrain: true, // 是否启用深度监测
// baseColor: '#00192f', // 地球默认背景色
- showGroundAtmosphere: true, // 是否在地球上绘制的地面大气
+ showGroundAtmosphere: false, // 是否在地球上绘制的地面大气
enableLighting: false // 是否显示昼夜区域
},
// 以下是Cesium.ScreenSpaceCameraController对象相关参数
@@ -302,27 +328,27 @@
{ name: "注记", type: "tdt", layer: "img_z", key: ["9ae78c51a0a28f06444d541148496e36"] },
]
},
- {
- "id": 2021,
- "pid": 10,
- "name": "天地图影像",
- "icon": "http://mars3d.cn/example/img/basemaps/tdt_img.png",
- "type": "tdt",
- "layer": "img_d",
- "key": ["9ae78c51a0a28f06444d541148496e36"],
- "show": true
- },
- {
- "id": 2020,
- "pid": 10,
- "name": "天地图电子",
- "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
- "type": "group",
- "layers": [
- { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["9ae78c51a0a28f06444d541148496e36"] },
- { "name": "注记", "type": "tdt", "layer": "vec_z", "key": ["9ae78c51a0a28f06444d541148496e36"] }
- ]
- },
+ // {
+ // "id": 2021,
+ // "pid": 10,
+ // "name": "天地图影像",
+ // "icon": "http://mars3d.cn/example/img/basemaps/tdt_img.png",
+ // "type": "tdt",
+ // "layer": "img_d",
+ // "key": ["9ae78c51a0a28f06444d541148496e36"],
+ // "show": true
+ // },
+ // {
+ // "id": 2020,
+ // "pid": 10,
+ // "name": "天地图电子",
+ // "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
+ // "type": "group",
+ // "layers": [
+ // { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["9ae78c51a0a28f06444d541148496e36"] },
+ // { "name": "注记", "type": "tdt", "layer": "vec_z", "key": ["9ae78c51a0a28f06444d541148496e36"] }
+ // ]
+ // },
],
}
// 创建三维地球场景
@@ -336,11 +362,34 @@
// 鼠标左键平移
map.scene.screenSpaceCameraController.rotateEventTypes = [Cesium.CameraEventType.LEFT_DRAG]
this.map = map
+ this.tiles3dLayer = new mars3d.layer.TilesetLayer({
+ name: '倾斜摄影',
+ url: 'http://111.198.10.15:20603/CRGroup03/tileset.json',
+ show:true,
+ type: '3dtiles',
+ maximumScreenSpaceError: 8,
+ maximumMemoryUsage: 1024,
+ // center: {lat: 27.750462, lng: 116.090196, alt: 130, heading: 3, pitch: 7 },
+ position: {
+ lng: 116.069103, lat: 27.756591, alt: -70
+ },
+ skipLevelOfDetail: true,
+ loadSiblings: true,
+ cullRequestsWhileMoving: true,
+ cullRequestsWhileMovingMultiplier: 10,
+ preferLeaves: true,
+ dynamicScreenSpaceError: true,
+ preloadWhenHidden: true,
+
+ flyTo: true
+ })
+ map.addLayer(this.tiles3dLayer)
let that = this
this.tile_layer = new mars3d.layer.ArcGisLayer({
url: 'http://223.82.47.232:11408/arcgis/rest/services/crgx/MapServer',
layers: '0,3',
+ show:false,
// maximumTerrainLevel: 19,
enablePickFeatures: false,
})
@@ -366,11 +415,14 @@
shape: 'pipeline',
radius: 0.1
},
+ callback: function (attr, styleOpt){
+ var val= {attr}.attr
+ return {setHeight: [-val.起始埋深,-val.终止埋深]}
+ }
},
popup: '名称：雨水管线
编号：{编号}
材质：{材质}
管径：{管径}
所属道路：{所属道路}',
})
map.addLayer(wfsLayer)
-
wfsLayer = new mars3d.layer.ArcGisWfsLayer({
name: '污水管线',
url: 'http://223.82.47.232:11408/arcgis/rest/services/crgx/MapServer/5',
@@ -382,13 +434,18 @@
shape: 'pipeline',
radius: 0.1
},
+ callback: function (attr, styleOpt){
+ var val= {attr}.attr
+ return {setHeight: [-val.起始埋深,-val.终止埋深]}
+ }
},
popup: '名称：污水管线
编号：{编号}
材质：{材质}
管径：{管径}
所属道路：{所属道路}',
})
map.addLayer(wfsLayer)
- wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+ this.ysline = new mars3d.layer.ArcGisWfsLayer({
name: '雨水线',
url: 'http://223.82.47.232:11408/arcgis/rest/services/crgx/MapServer/4',
+ // maximumLevel: 19,
enablePickFeatures: false,
symbol: {
type: 'polylineP',
@@ -399,11 +456,12 @@
},
})
- map.addLayer(wfsLayer)
+ map.addLayer(this.ysline)
- wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+ this.wsline = new mars3d.layer.ArcGisWfsLayer({
name: '污水线',
url: 'http://223.82.47.232:11408/arcgis/rest/services/crgx/MapServer/5',
+ // maximumLevel: 19,
enablePickFeatures: false,
symbol: {
type: 'polylineP',
@@ -414,7 +472,7 @@
},
})
- map.addLayer(wfsLayer)
+ map.addLayer(this.wsline)
this.initpoints("1=1")
this.refreshAlarm()
},
@@ -508,6 +566,10 @@
url: '../static/model/baojing.gltf',
scale: 1
},
+ // callback: function (attr, styleOpt){
+ // var val= {attr}.attr
+ // return {setHeight: val.井深}
+ // }
},
popup: function(e){
var val = e.graphic.options.attr
@@ -545,6 +607,9 @@
},
// 点击报警列表
alarmRowClick(row, column, event) {
+ if(this.alpha<10){
+ this.alpha = 15
+ }
this.flytoinit()
var that = this
if(this.fly_layer!==null) this.map.removeLayer(this.fly_layer)