diff --git a/public/config/config-outline.json b/public/config/config-outline.json new file mode 100644 index 0000000..b661573 --- /dev/null +++ b/public/config/config-outline.json @@ -0,0 +1,122 @@ +{ + "map3d": { + "chinaCRS":"WGS84", + "scene": { + "center": { + "lat": 32.017007, + "lng": 118.816721, + "alt": 1540, + "heading": 0, + "roll": 0, + "pitch": -22 + }, + "scene3DOnly": false, + "removeDblClick": true, + "sceneMode": 2, + "showSun": false, + "showMoon": false, + "showSkyBox": true, + "showSkyAtmosphere": true, + "fxaa": true, + "logarithmicDepthBuffer": false, + "requestRenderMode": true, + "globe": { + "depthTestAgainstTerrain": false, + "baseColor": "#546a53", + "showGroundAtmosphere": true, + "enableLighting": false + }, + "contextOptions": { + "webgl": { + "preserveDrawingBuffer": true + } + }, + "cameraController": { + "zoomFactor": 3.0, + "minimumZoomDistance": 1, + "maximumZoomDistance": 50000000, + "enableRotate": true, + "enableTranslate": true, + "enableTilt": true, + "enableZoom": true, + "enableCollisionDetection": true, + "minimumCollisionTerrainHeight": 15000 + } + }, + "control": { + "clockAnimate": false, + "homeButton": false, + "baseLayerPicker": false, + "sceneModePicker": true, + "vrButton": false, + "fullscreenButton": false, + "navigationHelpButton": false, + "animation": false, + "timeline": false, + "infoBox": false, + "geocoder": false, + "selectionIndicator": false, + "showRenderLoopErrors": false, + "contextmenu": { "hasDefault": true }, + "mouseDownView": true, + "zoom": { "insertIndex": 1 }, + "compass": { "bottom": "toolbar", "right": "5px" }, + "distanceLegend": { "left": "100px", "bottom": "-20px" }, + "locationBar": { + "crs": "CGCS2000_GK_Zone_3", + "crsDecimal": 0, + "template": "
经度:{lng}
纬度:{lat}
横{crsx} 纵{crsy}
海拔：{alt}米
层级：{level}
方向：{heading}°
俯仰角：{pitch}°
视高：{cameraHeight}米
" + } + }, + "templateValues": { + "dataServer": "//27.11.11.30:9000/3d-model/gaode", + "gltfServerUrl": "//27.11.11.30:9000/3d-model/gaode/gltf" + }, + "terrain": { + + }, + "basemaps": [ + { "id": 10, "name": "地图底图", "type": "group"}, + { + "id": 1000, + "pid": 10, + "name": "离线地图", + "chinaCRS":"GCJ02", + "icon": "https://27.11.11.30:9000/3d-model/gaode/img/thumbnail/basemap/tdt_img.png", + "type": "google", + "url": "http://27.11.11.30:9000/3d-model/chuzhou/{z}/{x}/{y}.webp", + "show": true + }, + { + "pid": 10, + "name": "高德影像", + "type": "group", + "icon": "https://27.11.11.30:9000/3d-model/gaode/img/thumbnail/basemap/tdt_img.png", + "layers": [ + { "name": "底图", "type": "gaode", "layer": "img_d" }, + { "name": "注记", "type": "gaode", "layer": "img_z" } + ] + },{ + "name": "天地图影像(EPSG:3857)", + "icon": "https://27.11.11.30:9000/3d-model/gaode/img/thumbnail/basemap/tdt_img.png", + "type": "tdt", + "layer": "img_d", + "show": false + }, + { + "name": "天地图电子(EPSG:3857)", + "icon": "https://27.11.11.30:9000/3d-model/gaode/img/thumbnail/basemap/tdt_vec.png", + "type": "group", + "layers": [ + { "name": "底图", "type": "tdt", "layer": "vec_d" }, + { "name": "注记", "type": "tdt", "layer": "vec_z" } + ] + } + ], + "layers": [ + { "id": 50, "name": "模型图层", "type": "group" }, + { "id": 10000, "name": "行政区", "type": "group" } + + ] + } +} diff --git a/public/config/config.json b/public/config/config.json index b661573..d10837e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -5,10 +5,10 @@ "center": { "lat": 32.017007, "lng": 118.816721, - "alt": 1540, + "alt": 301540, "heading": 0, "roll": 0, - "pitch": -22 + "pitch": -90 }, "scene3DOnly": false, "removeDblClick": true, @@ -18,7 +18,6 @@ "showSkyBox": true, "showSkyAtmosphere": true, "fxaa": true, - "logarithmicDepthBuffer": false, "requestRenderMode": true, "globe": { "depthTestAgainstTerrain": false, @@ -69,11 +68,17 @@ } }, "templateValues": { - "dataServer": "//27.11.11.30:9000/3d-model/gaode", - "gltfServerUrl": "//27.11.11.30:9000/3d-model/gaode/gltf" + "dataServer": "//data.mars3d.cn", + "gltfServerUrl": "//data.mars3d.cn/gltf" }, "terrain": { - + "type": "arcgis", + "url": "https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer", + "show": false, + "requestVertexNormals": false, + "requestWaterMask": false, + "requestMetadata": false, + "maximumScreenSpaceError": 2 }, "basemaps": [ { "id": 10, "name": "地图底图", "type": "group"}, @@ -82,40 +87,47 @@ "pid": 10, "name": "离线地图", "chinaCRS":"GCJ02", - "icon": "https://27.11.11.30:9000/3d-model/gaode/img/thumbnail/basemap/tdt_img.png", + "icon": "https://data.mars3d.cn/img/thumbnail/basemap/tdt_img.png", "type": "google", - "url": "http://27.11.11.30:9000/3d-model/chuzhou/{z}/{x}/{y}.webp", - "show": true + "url": "https://shanghai-jsredfly-test.oss-cn-shanghai.aliyuncs.com/map/daxinggong/{z}/{x}/{y}.webp" }, { "pid": 10, "name": "高德影像", "type": "group", - "icon": "https://27.11.11.30:9000/3d-model/gaode/img/thumbnail/basemap/tdt_img.png", + "icon": "https://data.mars3d.cn/img/thumbnail/basemap/tdt_img.png", "layers": [ { "name": "底图", "type": "gaode", "layer": "img_d" }, { "name": "注记", "type": "gaode", "layer": "img_z" } ] },{ - "name": "天地图影像(EPSG:3857)", - "icon": "https://27.11.11.30:9000/3d-model/gaode/img/thumbnail/basemap/tdt_img.png", + "name": "天地图影像", + "icon": "https://data.mars3d.cn/img/thumbnail/basemap/tdt_img.png", "type": "tdt", "layer": "img_d", - "show": false + "show": true }, { - "name": "天地图电子(EPSG:3857)", - "icon": "https://27.11.11.30:9000/3d-model/gaode/img/thumbnail/basemap/tdt_vec.png", + "name": "天地图注记", + "icon": "https://data.mars3d.cn/img/thumbnail/basemap/tdt_vec.png", + "type": "group", + "layers": [ + { "name": "注记", "type": "tdt", "layer": "vec_z" } + ], + "show": true + }, + { + "name": "天地图电子", + "icon": "https://data.mars3d.cn/img/thumbnail/basemap/tdt_vec.png", "type": "group", "layers": [ { "name": "底图", "type": "tdt", "layer": "vec_d" }, { "name": "注记", "type": "tdt", "layer": "vec_z" } - ] + ], + "show": false } ], "layers": [ - { "id": 50, "name": "模型图层", "type": "group" }, - { "id": 10000, "name": "行政区", "type": "group" } ] } diff --git a/src/pages/dataGovernanceDashboard/views/index.vue b/src/pages/dataGovernanceDashboard/views/index.vue index 06c861f..7a5df83 100644 --- a/src/pages/dataGovernanceDashboard/views/index.vue +++ b/src/pages/dataGovernanceDashboard/views/index.vue @@ -296,6 +296,11 @@ const setDock = (item : any) => { let { liveSn, liveType, deviceInfo } = item + console.info("[aixiaorui] setDock", { + liveSn, + liveType, + deviceInfo + }) liveContent.data.showLiveModal = false nextTick(() => { liveContent.data.showLiveModal = true @@ -2716,4 +2721,4 @@ white-space: nowrap; } - \ No newline at end of file + diff --git a/vite.config.ts b/vite.config.ts index b48c316..b6be78d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -8,8 +8,8 @@ import eslintPlugin from "vite-plugin-eslint" import { mars3dPlugin } from "vite-plugin-mars3d" import { createStyleImportPlugin, AndDesignVueResolve } from "vite-plugin-style-import" -const baseTargetUrl = '27.11.11.30/' -// const baseTargetUrl = '221.226.33.58:18800/' +// const baseTargetUrl = '27.11.11.30/' +const baseTargetUrl = 'c2.zklhjs.com/' export default ({ mode }: ConfigEnv) => { const root = process.cwd()