diff --git a/public/config.js b/public/config.js index 7dc8101..26937ed 100644 --- a/public/config.js +++ b/public/config.js @@ -1,7 +1,10 @@ +import { vector } from "echarts"; + const isCamera = false; // 是否开启相机限制 const cameraLon = 116.3974; // 相机经度 const cameraLat = 39.9042; // 相机纬度 const cameraRadius = 40000; // 相机半径 +const zoom = 12; // 地图缩放级别 const allPositionLon = 117.278262; // 全部防区跳转经度 const allPositionLat = 39.036963; // 全部防区跳转纬度 const allPositionAlt = 4000; // 全部防区跳转高度 @@ -20,8 +23,14 @@ window.mapConfig = { allPositionLon: allPositionLon, allPositionLat: allPositionLat, allPositionAlt: allPositionAlt, + zoom: zoom, allPositionPitch: allPositionPitch, currTime: currTime, uavSize: uavSize, - uaColor: uaColor + uaColor: uaColor, + vectorLayer: "vec", //白色底图 + ciatorLayer: "cia", //默认注记 + // 地图地址配置 + mapUrl: + "http://t{0-7}.tianditu.gov.cn/${layerType}_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=${layerType}&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${tiandituKey}" }; diff --git a/src/api/alarm.js b/src/api/alarm.js index fdc670c..d73b812 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -3,7 +3,7 @@ import request from "@/utils/request"; // 获取告警列表 export function alarmList(data) { return request({ - url: "/api/Alarm/list", + url: "/api/Alarm/list1", method: "get", params: data }); diff --git a/src/views/mapControl/index.vue b/src/views/mapControl/index.vue index 1032570..e0a8c40 100644 --- a/src/views/mapControl/index.vue +++ b/src/views/mapControl/index.vue @@ -256,8 +256,14 @@ export default { new LayerGroup({ title: "白色底图组", layers: [ - this.createTiandituLayer("vec", "天地图矢量底图"), // 白色底图 - this.createTiandituLayer("cia", "天地图默认注记") // 默认注记 + this.createTiandituLayer( + window.mapConfig.vectorLayer, + "天地图矢量底图" + ), // 白色底图 + this.createTiandituLayer( + window.mapConfig.ciatorLayer, + "天地图默认注记" + ) // 默认注记 ], visible: true // 默认显示白色底图 }), @@ -266,12 +272,12 @@ export default { title: "暗色底图组", layers: [ this.createTiandituLayer( - "vec", + window.mapConfig.vectorLayer, "天地图暗色底图", "grayscale(98%) invert(100%) sepia(20%) hue-rotate(180deg) saturate(1600%) brightness(80%) contrast(90%)" ), // 暗色底图 this.createTiandituLayer( - "cia", + window.mapConfig.ciatorLayer, "天地图白色注记", "grayscale(100%) brightness(150%) contrast(120%)" ) // 白色注记 @@ -281,8 +287,11 @@ export default { ], view: new View({ projection: "EPSG:3857", - center: fromLonLat([117.337103, 39.040924]), // 经纬度转投影坐标 - zoom: 10, + center: fromLonLat([ + window.mapConfig.cameraLon, + window.mapConfig.cameraLat + ]), // 经纬度转投影坐标 + zoom: window.mapConfig.zoom, minZoom: 0, maxZoom: 18, constrainRotation: false @@ -320,7 +329,7 @@ export default { visible: true, name: title, source: new XYZ({ - url: `http://t{0-7}.tianditu.gov.cn/${layerType}_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=${layerType}&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${tiandituKey}`, + url: window.mapConfig.mapUrl, tileLoadFunction: filter ? (imageTile, src) => { const img = new Image();