<%= htmlWebpackPlugin.options.title %>

diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js new file mode 100644 index 0000000..5b9b78e --- /dev/null +++ b/public/config/mapConfig.js @@ -0,0 +1,27 @@ +// 3维地图有关配置 +const config = { + terrian:{ + type: 'xyz', // 地形类型，xyz: 标准xyz服务，none: 无地形，arcgis arcgis地形服务 + url:'http://data.mars3d.cn/terrain' + }, // 地形，地形只支持一个 + crs:'EPSG:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + basemaps:[ + { + name:'天地图影像', // 图层名称 + type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, + key:'xxxx', // 密钥 + url:'' // 地址 + } + ],// 地图图层 + threedlayers:[ + { + name:'管网图层', + type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 + url:'', // 地址 + center: {}, // 中心位置 + flyto: true + } + ] // 矢量图层 +} +window.mapConfig = config + diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js new file mode 100644 index 0000000..5b9b78e --- /dev/null +++ b/public/config/mapConfig.js @@ -0,0 +1,27 @@ +// 3维地图有关配置 +const config = { + terrian:{ + type: 'xyz', // 地形类型，xyz: 标准xyz服务，none: 无地形，arcgis arcgis地形服务 + url:'http://data.mars3d.cn/terrain' + }, // 地形，地形只支持一个 + crs:'EPSG:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + basemaps:[ + { + name:'天地图影像', // 图层名称 + type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, + key:'xxxx', // 密钥 + url:'' // 地址 + } + ],// 地图图层 + threedlayers:[ + { + name:'管网图层', + type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 + url:'', // 地址 + center: {}, // 中心位置 + flyto: true + } + ] // 矢量图层 +} +window.mapConfig = config + diff --git a/public/index.html b/public/index.html index 3e5a139..33f84ea 100644 --- a/public/index.html +++ b/public/index.html @@ -6,6 +6,7 @@ <%= htmlWebpackPlugin.options.title %> +

<%= htmlWebpackPlugin.options.title %> diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 741ac08..0e8adac 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -1,5 +1,12 @@ -export function getDayTime(nowTime) { - const nowTimeDate = new Date(nowTime) - nowTimeDate.setHours(0, 0, 0, 0) - return new Date(nowTimeDate) +/** + * 获取3D地图图层配置 + * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 + * @returns {Object} + */ +export function getMapLayers(type = 'file') { + if (type === 'file') { + return window.mapConfig + } else { + // todo: 从接口获取地图配置 + } } diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js new file mode 100644 index 0000000..5b9b78e --- /dev/null +++ b/public/config/mapConfig.js @@ -0,0 +1,27 @@ +// 3维地图有关配置 +const config = { + terrian:{ + type: 'xyz', // 地形类型，xyz: 标准xyz服务，none: 无地形，arcgis arcgis地形服务 + url:'http://data.mars3d.cn/terrain' + }, // 地形，地形只支持一个 + crs:'EPSG:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + basemaps:[ + { + name:'天地图影像', // 图层名称 + type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, + key:'xxxx', // 密钥 + url:'' // 地址 + } + ],// 地图图层 + threedlayers:[ + { + name:'管网图层', + type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 + url:'', // 地址 + center: {}, // 中心位置 + flyto: true + } + ] // 矢量图层 +} +window.mapConfig = config + diff --git a/public/index.html b/public/index.html index 3e5a139..33f84ea 100644 --- a/public/index.html +++ b/public/index.html @@ -6,6 +6,7 @@ <meta name="viewport" content="width=device-width,initial-scale=1.0"> <link rel="icon" href="<%= BASE_URL %>favicon.ico"> <title><%= htmlWebpackPlugin.options.title %></title> + <script src="./config/mapConfig.js"></script> </head> <body> <noscript> diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 741ac08..0e8adac 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -1,5 +1,12 @@ -export function getDayTime(nowTime) { - const nowTimeDate = new Date(nowTime) - nowTimeDate.setHours(0, 0, 0, 0) - return new Date(nowTimeDate) +/** + * 获取3D地图图层配置 + * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 + * @returns {Object} + */ +export function getMapLayers(type = 'file') { + if (type === 'file') { + return window.mapConfig + } else { + // todo: 从接口获取地图配置 + } } diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 94e04bb..5462b41 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -21,7 +21,7 @@ return { dataGroup: [ { - title: '井总数量', + title: '安装点位', flags: '', context: '--', icon: 'icon-well', @@ -30,7 +30,7 @@ permission: '/well/list' }, { - title: '设备数量', + title: '智能设备', flags: '', context: '--', icon: 'icon-device', diff --git a/public/config/mapConfig.js b/public/config/mapConfig.js new file mode 100644 index 0000000..5b9b78e --- /dev/null +++ b/public/config/mapConfig.js @@ -0,0 +1,27 @@ +// 3维地图有关配置 +const config = { + terrian:{ + type: 'xyz', // 地形类型，xyz: 标准xyz服务，none: 无地形，arcgis arcgis地形服务 + url:'http://data.mars3d.cn/terrain' + }, // 地形，地形只支持一个 + crs:'EPSG:3857', // 坐标系，支持EPSG:3857(墨卡托), EPSG4326（WSG84）, EPSG:4490(CGCS2000) + basemaps:[ + { + name:'天地图影像', // 图层名称 + type:'tdt', //图层类型： tdt天地图，gaode高德地图，wmts, wms, + key:'xxxx', // 密钥 + url:'' // 地址 + } + ],// 地图图层 + threedlayers:[ + { + name:'管网图层', + type:'S3M', // 矢量图层类型: S3M超图，tiles 3DTiles模型， gltf glTF小模型 + url:'', // 地址 + center: {}, // 中心位置 + flyto: true + } + ] // 矢量图层 +} +window.mapConfig = config + diff --git a/public/index.html b/public/index.html index 3e5a139..33f84ea 100644 --- a/public/index.html +++ b/public/index.html @@ -6,6 +6,7 @@ <meta name="viewport" content="width=device-width,initial-scale=1.0"> <link rel="icon" href="<%= BASE_URL %>favicon.ico"> <title><%= htmlWebpackPlugin.options.title %></title> + <script src="./config/mapConfig.js"></script> </head> <body> <noscript> diff --git a/src/utils/maputils.js b/src/utils/maputils.js index 741ac08..0e8adac 100644 --- a/src/utils/maputils.js +++ b/src/utils/maputils.js @@ -1,5 +1,12 @@ -export function getDayTime(nowTime) { - const nowTimeDate = new Date(nowTime) - nowTimeDate.setHours(0, 0, 0, 0) - return new Date(nowTimeDate) +/** + * 获取3D地图图层配置 + * @param type 类型，type=file是从文件中读取，type=api是从接口中获取 + * @returns {Object} + */ +export function getMapLayers(type = 'file') { + if (type === 'file') { + return window.mapConfig + } else { + // todo: 从接口获取地图配置 + } } diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 94e04bb..5462b41 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -21,7 +21,7 @@ return { dataGroup: [ { - title: '井总数量', + title: '安装点位', flags: '', context: '--', icon: 'icon-well', @@ -30,7 +30,7 @@ permission: '/well/list' }, { - title: '设备数量', + title: '智能设备', flags: '', context: '--', icon: 'icon-device', diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue index 0a67a95..aa511b8 100644 --- a/src/views/overview/overview3d.vue +++ b/src/views/overview/overview3d.vue @@ -4,6 +4,7 @@ <script> import * as mars3d from 'mars3d' +import { getMapLayers } from '@/utils/maputils' export default { name: 'Overview3d', mounted() { @@ -11,6 +12,8 @@ }, methods: { initMap() { + const mapLayers = getMapLayers() + console.log(mapLayers) // 创建三维地球场景 const map = new mars3d.Map('map3dContainer', { scene: {