diff --git a/packages/screen/src/views/cockpit/api/DDT.json b/packages/screen/src/views/cockpit/api/DDT.json new file mode 100644 index 0000000..6276df0 --- /dev/null +++ b/packages/screen/src/views/cockpit/api/DDT.json @@ -0,0 +1,67 @@ +[ + { + "Rid": "4126", + "Name": "底图", + "Attribute": { + "rid": 4126, + "name": "底图", + "layerId": 0, + "internalService": 1, + "serviceTypeId": "", + "serviceTypeName": "", + "servicePath": "", + "domainService": "", + "status": 0, + "parentId": "#", + "sortValue": 2, + "createTime": "2025-05-26T14:44:05.926Z", + "dataType": "1", + "bootLoad": 0, + "internalServiceName": "", + "historyServicePath": "", + "expandParam": "", + "thumbnail": "", + "showDirectory": 0, + "selectSubLayer": "", + "accessInfo": "", + "pcatalog": "DDT", + "orgCode": "YLZG" + }, + "Children": [ + { + "Rid": "928", + "Name": "重庆三维", + "Attribute": { + "rid": 928, + "name": "重庆三维", + "layerId": 0, + "internalService": 2, + "serviceTypeId": "", + "serviceTypeName": "WmsServiceLayer", + "servicePath": "/ylzggeoserver/gwc/service/wms?service=WMS&version=1.3.0&request=GetMap&layers=chongqing_yx", + "domainService": "", + "status": 0, + "parentId": "4126", + "sortValue": 10, + "createTime": "2025-10-18T15:04:46.56008Z", + "dataType": "2", + "bootLoad": 0, + "internalServiceName": "", + "historyServicePath": "", + "expandParam": "{\"mapUseRange\":[\"2D\"],\"data\":[],\"expandedNode\":false,\"isUseExpandParam\":false,\"mapIndex\":1}", + "thumbnail": "", + "showDirectory": 0, + "selectSubLayer": "", + "accessInfo": "{\"verifyType\":\"usrpwd\",\"tokenName\":\"token\",\"isUseVerification\":false,\"isUseToken\":false,\"verifyParams\":{\"url\":\"\",\"username\":\"\",\"password\":\"\",\"token\":\"\",\"tokenLoginUrl\":\"\",\"requestType\":\"Get\",\"requestParam\":\"\",\"interval\":60,\"rule\":\"\",\"tokenName\":\"\"}}", + "pcatalog": "DDT", + "orgCode": "YLZG" + }, + "Children": [], + "SortValue": 0, + "ParentId": "" + } + ], + "SortValue": 0, + "ParentId": "" + } +] \ No newline at end of file diff --git a/packages/screen/src/views/cockpit/api/commonHttp.js b/packages/screen/src/views/cockpit/api/commonHttp.js index 3c4ec8c..1c7ade9 100644 --- a/packages/screen/src/views/cockpit/api/commonHttp.js +++ b/packages/screen/src/views/cockpit/api/commonHttp.js @@ -1,12 +1,37 @@ import { request } from '@shared/utils/request' +import si from './si.json' +import ddt from './DDT.json' // 获取业务基础地图 -export function getBusinessBaseMapLayer() { +export function getBusinessBaseMapDDT() { + return [...ddt] + // return request({ + // url: '/snow-ops-platform/dataDirectory/queryCatalog', + // method: 'GET', + // params: { + // pcatalog: 'DDT' + // } + // }) +} + +// 获取业务基础地图 +export function getBusinessBaseMapSI() { + return [...si] + // return request({ + // url: '/snow-ops-platform/dataDirectory/queryCatalog', + // method: 'GET', + // params: { + // pcatalog: 'SI' + // } + // }) +} + +export function test() { return request({ - url: '/snow-ops-platform/dataDirectory/queryCatalog', - method: 'GET', - params: { - pcatalog: 'DDT' - } + url: '/ylzggeoserver/gwc/service/wms?service=WMS&request=GetMap&transparent=true&srs=EPSG%3A3857&format=image%2Fpng&styles=&layers=chongqing_yx&bbox=12053813.612459153%2C3130860.6785608195%2C12210356.646387197%2C3287403.71248886&width=256&height=256', + method: 'get' }) -} \ No newline at end of file +} + + + diff --git a/packages/screen/src/views/cockpit/api/si.json b/packages/screen/src/views/cockpit/api/si.json new file mode 100644 index 0000000..5d04a51 --- /dev/null +++ b/packages/screen/src/views/cockpit/api/si.json @@ -0,0 +1,196 @@ +[ + { + "Rid": "922", + "Name": "地图服务", + "Attribute": { + "id": 922, + "name": "地图服务", + "externalService": 0, + "internalService": 0, + "serviceTypeId": null, + "serviceTypeName": null, + "servicePath": null, + "domainService": null, + "status": 0, + "parentId": "#", + "sortValue": 1, + "createTime": null, + "dataType": "1", + "bootLoad": 0, + "internalServiceName": null, + "historyServicePath": null, + "expandParam": null, + "thumbnail": null, + "showDirectory": 0, + "selectSublayer": null, + "accessInfo": null, + "pcatalog": "SI", + "orgCode": "YLZG" + }, + "Children": [ + { + "Rid": "936", + "Name": "三维模型", + "Attribute": { + "id": 936, + "name": "三维模型", + "externalService": 0, + "internalService": 0, + "serviceTypeId": null, + "serviceTypeName": null, + "servicePath": null, + "domainService": null, + "status": 0, + "parentId": "922", + "sortValue": 1, + "createTime": null, + "dataType": "1", + "bootLoad": 0, + "internalServiceName": null, + "historyServicePath": null, + "expandParam": null, + "thumbnail": null, + "showDirectory": 0, + "selectSublayer": null, + "accessInfo": null, + "pcatalog": "SI", + "orgCode": "YLZG" + }, + "Children": [ + { + "Rid": "923", + "Name": "S107", + "Attribute": { + "id": 923, + "name": "S107", + "externalService": 0, + "internalService": 2, + "serviceTypeId": null, + "serviceTypeName": "Cesium3DTileService", + "servicePath": "http://222.212.85.86:9000/300bdf2b-a150-406e-be63-d28bd29b409f/model/S107/terra_b3dms/tileset.json", + "domainService": null, + "status": 0, + "parentId": "936", + "sortValue": 1, + "createTime": null, + "dataType": "2", + "bootLoad": 0, + "internalServiceName": null, + "historyServicePath": null, + "expandParam": "{\"data\":[],\"editUrl\":\"\",\"isUseExpandParam\":false,\"expandedNode\":false,\"mapUseRange\":[\"2D\"]}", + "thumbnail": null, + "showDirectory": 0, + "selectSublayer": null, + "accessInfo": "{\"verifyType\":\"usrpwd\",\"tokenName\":\"token\",\"isUseVerification\":false,\"isUseToken\":false,\"verifyParams\":{\"url\":\"\",\"username\":\"\",\"password\":\"\",\"token\":\"\",\"tokenLoginUrl\":\"\",\"requestType\":\"Get\",\"requestParam\":\"\",\"interval\":60,\"rule\":\"\",\"tokenName\":\"\"}}", + "pcatalog": "SI", + "orgCode": "YLZG" + }, + "Children": [], + "SortValue": null, + "ParentId": null + } + ], + "SortValue": null, + "ParentId": null + }, + { + "Rid": "927", + "Name": "行政区划服务", + "Attribute": { + "id": 927, + "name": "行政区划服务", + "externalService": 0, + "internalService": 2, + "serviceTypeId": null, + "serviceTypeName": "WmsServiceLayer", + "servicePath": "/ylzggeoserver/cite/wms?service=WMS&version=1.3.0&request=GetMap&layers=cite:base_xzqh_geo", + "domainService": null, + "status": 0, + "parentId": "922", + "sortValue": 10, + "createTime": null, + "dataType": "2", + "bootLoad": 1, + "internalServiceName": null, + "historyServicePath": null, + "expandParam": "{\"mapUseRange\":[\"2D\"],\"data\":[],\"expandedNode\":false,\"isUseExpandParam\":false,\"mapIndex\":1}", + "thumbnail": null, + "showDirectory": 0, + "selectSublayer": null, + "accessInfo": "{\"verifyType\":\"usrpwd\",\"tokenName\":\"token\",\"isUseVerification\":false,\"isUseToken\":false,\"verifyParams\":{\"url\":\"\",\"username\":\"\",\"password\":\"\",\"token\":\"\",\"tokenLoginUrl\":\"\",\"requestType\":\"Get\",\"requestParam\":\"\",\"interval\":60,\"rule\":\"\",\"tokenName\":\"\"}}", + "pcatalog": "SI", + "orgCode": "YLZG" + }, + "Children": [], + "SortValue": null, + "ParentId": null + }, + { + "Rid": "940", + "Name": "管理段路线名称", + "Attribute": { + "id": 940, + "name": "管理段路线名称", + "externalService": 0, + "internalService": 2, + "serviceTypeId": null, + "serviceTypeName": "WmsServiceLayer", + "servicePath": "/ylzggeoserver/cite/wms?service=WMS&version=1.3.0&request=GetMap&layers=cite:nianbao_2024_3857_lxbq&cql_filter=XZQH_ID%3D%27402880e74a28b152014a28b885c60000%27", + "domainService": null, + "status": 0, + "parentId": "922", + "sortValue": 16, + "createTime": null, + "dataType": "2", + "bootLoad": 1, + "internalServiceName": null, + "historyServicePath": null, + "expandParam": "{\"mapUseRange\":[\"2D\"],\"data\":[],\"expandedNode\":false,\"isUseExpandParam\":false,\"mapIndex\":1}", + "thumbnail": null, + "showDirectory": 0, + "selectSublayer": null, + "accessInfo": "{\"verifyType\":\"usrpwd\",\"tokenName\":\"token\",\"isUseVerification\":false,\"isUseToken\":false,\"verifyParams\":{\"url\":\"\",\"username\":\"\",\"password\":\"\",\"token\":\"\",\"tokenLoginUrl\":\"\",\"requestType\":\"Get\",\"requestParam\":\"\",\"interval\":60,\"rule\":\"\",\"tokenName\":\"\"}}", + "pcatalog": "SI", + "orgCode": "YLZG" + }, + "Children": [], + "SortValue": null, + "ParentId": null + }, + { + "Rid": "937", + "Name": "管理段", + "Attribute": { + "id": 937, + "name": "管理段", + "externalService": 0, + "internalService": 2, + "serviceTypeId": null, + "serviceTypeName": "WmsServiceLayer", + "servicePath": "/ylzggeoserver/cite/wms?service=WMS&version=1.3.0&request=GetMap&layers=cite:nianbao_2024_3857&cql_filter=XZQH_ID%3D%27402880e74a28b152014a28b885c60000%27", + "domainService": null, + "status": 0, + "parentId": "922", + "sortValue": 16, + "createTime": null, + "dataType": "2", + "bootLoad": 1, + "internalServiceName": null, + "historyServicePath": null, + "expandParam": "{\"mapUseRange\":[\"2D\"],\"data\":[],\"expandedNode\":false,\"isUseExpandParam\":false,\"mapIndex\":1}", + "thumbnail": null, + "showDirectory": 0, + "selectSublayer": null, + "accessInfo": "{\"verifyType\":\"usrpwd\",\"tokenName\":\"token\",\"isUseVerification\":false,\"isUseToken\":false,\"verifyParams\":{\"url\":\"\",\"username\":\"\",\"password\":\"\",\"token\":\"\",\"tokenLoginUrl\":\"\",\"requestType\":\"Get\",\"requestParam\":\"\",\"interval\":60,\"rule\":\"\",\"tokenName\":\"\"}}", + "pcatalog": "SI", + "orgCode": "YLZG" + }, + "Children": [], + "SortValue": null, + "ParentId": null + } + ], + "SortValue": null, + "ParentId": null + } +] \ No newline at end of file diff --git a/packages/screen/src/views/cockpit/components/ImageMarkTooltip/ImageMarkTooltip.vue b/packages/screen/src/views/cockpit/components/ImageMarkTooltip/ImageMarkTooltip.vue index 57e4d99..1b7dfd1 100644 --- a/packages/screen/src/views/cockpit/components/ImageMarkTooltip/ImageMarkTooltip.vue +++ b/packages/screen/src/views/cockpit/components/ImageMarkTooltip/ImageMarkTooltip.vue @@ -1,27 +1,18 @@ \ No newline at end of file diff --git a/packages/screen/src/views/cockpit/composables/useMapBase.js b/packages/screen/src/views/cockpit/composables/useMapBase.js index 2983faf..8d5e40f 100644 --- a/packages/screen/src/views/cockpit/composables/useMapBase.js +++ b/packages/screen/src/views/cockpit/composables/useMapBase.js @@ -1,12 +1,38 @@ -import { getBusinessBaseMapLayer } from '@/views/cockpit/api/commonHttp.js' +import { getBusinessBaseMapDDT, getBusinessBaseMapSI, test } from '@/views/cockpit/api/commonHttp.js' // 当前页面的最基础地图服务 // 主要是加载地图底图 export const useMapBase = (mapStore) => { - const loadBusinessBaseMapLayer = async () => { + const loadBusinessBaseMapDDT = async () => { const layerService = mapStore.services().layer - const res = await getBusinessBaseMapLayer() + const res = await getBusinessBaseMapDDT() + const data = [...res] + mapStore.baseMapGroups = data + for (const item of data) { + const layers = mapStore.getBaseMapLayersForGroup(item.Attribute?.rid || item.Rid) + for (const layerConfig of layers) { + const layer = { + id: layerConfig.id, + type: layerConfig.type, + url: layerConfig.url, + meta: layerConfig.meta, + options: { + parameters: { + srs: 'EPSG:3857', + transparent: true, + } + } + + } + await layerService.addLayer(layer) + } + } + } + + const loadBusinessBaseMapLayerSI = async () => { + const layerService = mapStore.services().layer + const res = await getBusinessBaseMapSI() const data = [...res] mapStore.baseMapGroups = data for (const item of data) { @@ -21,13 +47,13 @@ export const useMapBase = (mapStore) => { await layerService.addLayer(layer) } } - - } const loadBaseData = () => { setTimeout(() => { - loadBusinessBaseMapLayer() + // loadBusinessBaseMapDDT() + // test() + loadBusinessBaseMapLayerSI() }, 0) }