|
@@ -60,6 +60,7 @@ import FeaturePointsPlottingEvent from "../units/map/FeaturePointsPlottingEvent.
|
|
|
import FeaturePolygonPlottingEvent from "../units/map/FeaturePolygonPlottingEvent.js";
|
|
|
import HeatMap from "../units/map/HeatMap.js";
|
|
|
import AddGraphicsEvent from "../units/map/AddGraphicsEvent.js";
|
|
|
+import GeometryMeshFrustumEffect from "../units/map/GeometryMeshFrustumEffect.js";
|
|
|
export default {
|
|
|
name: "mapJK",
|
|
|
setup(){
|
|
@@ -95,6 +96,8 @@ export default {
|
|
|
let addGraphicsEvent = null;
|
|
|
let featurePointsPlottingEvent = null;
|
|
|
let currentShowGridId = null;
|
|
|
+ let realFlyPointDataQueue = [];
|
|
|
+ let lastChosenLevelIndex = null;
|
|
|
onMounted(() =>{
|
|
|
bus.on('CreateMap',() =>{
|
|
|
MapReady = $.Deferred();
|
|
@@ -230,6 +233,9 @@ export default {
|
|
|
case "GeometryMeshPrismEffect":
|
|
|
geometryMeshPrismEffect(params);
|
|
|
break;
|
|
|
+ case "GeometryMeshFrustumEffect":
|
|
|
+ geometryMeshFrustumEffect(params);
|
|
|
+ break;
|
|
|
case "PathPipe":
|
|
|
pathPipe(params);
|
|
|
break;
|
|
@@ -1112,18 +1118,86 @@ export default {
|
|
|
|
|
|
|
|
|
//不同比例尺加载白膜
|
|
|
+ // function showLayersWithScaleEventsReturn(scaleValue){
|
|
|
+ // let layer = m_map.layers.find(item => item.id === "WhiteMold");
|
|
|
+ // if(scaleValue > 50000){
|
|
|
+ // if(layer){
|
|
|
+ // layer.visible = false;
|
|
|
+ // }
|
|
|
+ // }else{
|
|
|
+ // if(layer){
|
|
|
+ // layer.visible = true;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ //不同比例尺加载网格
|
|
|
function showLayersWithScaleEventsReturn(scaleValue){
|
|
|
- let layer = m_map.layers.find(item => item.id === "WhiteMold");
|
|
|
- if(scaleValue > 50000){
|
|
|
- if(layer){
|
|
|
- layer.visible = false;
|
|
|
- }
|
|
|
- }else{
|
|
|
- if(layer){
|
|
|
- layer.visible = true;
|
|
|
- }
|
|
|
+ debugger
|
|
|
+ switch (true) {
|
|
|
+ case (scaleValue > 1000000): //15级以上隐藏
|
|
|
+ getRealPower2({
|
|
|
+ status:'hide'
|
|
|
+ })
|
|
|
+ break;
|
|
|
+ case (scaleValue <= 1000000 && scaleValue > 30000): //15级
|
|
|
+ getRealPower2({
|
|
|
+ status:"show",
|
|
|
+ id:"power_wj",
|
|
|
+ fields:["demographics","green","river","road","collision_buffer","no_fly_zone_buffer","clear_zone_buffer"],
|
|
|
+ center:m_view.center,
|
|
|
+ radius: (m_view.extent.xmax - m_view.extent.xmin) > (m_view.extent.ymax - m_view.extent.ymin) ? (m_view.extent.xmax - m_view.extent.xmin) : (m_view.extent.ymax - m_view.extent.ymin),
|
|
|
+ minZ: 0,
|
|
|
+ maxZ: 1000,
|
|
|
+ level: 15,
|
|
|
+ size:{ x: 1582.2726823222256, y: 1856.6079667204758, z: 1724.5956527210265 }
|
|
|
+ })
|
|
|
+ break;
|
|
|
+ case (scaleValue <= 30000 && scaleValue > 5000): //20级
|
|
|
+ getRealPower2({
|
|
|
+ status:"show",
|
|
|
+ id:"power_wj",
|
|
|
+ fields:["demographics","green","river","road","collision_buffer","no_fly_zone_buffer","clear_zone_buffer"],
|
|
|
+ center:m_view.center,
|
|
|
+ radius: (m_view.extent.xmax - m_view.extent.xmin) > (m_view.extent.ymax - m_view.extent.ymin) ? (m_view.extent.xmax - m_view.extent.xmin) : (m_view.extent.ymax - m_view.extent.ymin),
|
|
|
+ minZ: 0,
|
|
|
+ maxZ: 120,
|
|
|
+ level: 20,
|
|
|
+ size:{ x: 52.887881893650956, y: 61.627412608112536, z: 53.887012166300096 }
|
|
|
+ })
|
|
|
+ break;
|
|
|
+ case (scaleValue <= 5000 && scaleValue > 1000): //22级
|
|
|
+ getRealPower2({
|
|
|
+ status:"show",
|
|
|
+ id:"power_wj",
|
|
|
+ fields:["demographics","green","river","road","collision_buffer","no_fly_zone_buffer","clear_zone_buffer"],
|
|
|
+ center:m_view.center,
|
|
|
+ radius: (m_view.extent.xmax - m_view.extent.xmin) > (m_view.extent.ymax - m_view.extent.ymin) ? (m_view.extent.xmax - m_view.extent.xmin) : (m_view.extent.ymax - m_view.extent.ymin),
|
|
|
+ minZ: 0,
|
|
|
+ maxZ: 20,
|
|
|
+ level: 22,
|
|
|
+ size:{ x: 13.222978864358083, y: 15.406742669116284, z: 13.471596544164798 }
|
|
|
+ })
|
|
|
+ break;
|
|
|
+ case (scaleValue <= 1000): //23级
|
|
|
+ getRealPower2({
|
|
|
+ status:"show",
|
|
|
+ id:"power_wj",
|
|
|
+ fields:["demographics","green","river","road","collision_buffer","no_fly_zone_buffer","clear_zone_buffer"],
|
|
|
+ center:m_view.center,
|
|
|
+ radius: (m_view.extent.xmax - m_view.extent.xmin) > (m_view.extent.ymax - m_view.extent.ymin) ? (m_view.extent.xmax - m_view.extent.xmin) : (m_view.extent.ymax - m_view.extent.ymin),
|
|
|
+ minZ: 0,
|
|
|
+ maxZ: 20,
|
|
|
+ level: 23,
|
|
|
+ size:{ x: 6.7358, y: 7.7024, z: 6.6111 }
|
|
|
+ })
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
function viewshedAnalysis(params){
|
|
|
let status = params.status;
|
|
|
if(status === "hide"){
|
|
@@ -1241,6 +1315,28 @@ export default {
|
|
|
m_map.add(geometryMeshPrismEffect.graphicsLayer);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ function geometryMeshFrustumEffect(params){
|
|
|
+ debugger
|
|
|
+ let status = params.status;
|
|
|
+ let f_layer = m_map.layers.find(item => item.id === "geometryMeshFrustumEffect");
|
|
|
+ if (f_layer) {
|
|
|
+ m_map.remove(f_layer);
|
|
|
+ }
|
|
|
+ if(status == "hide"){
|
|
|
+ return
|
|
|
+ }
|
|
|
+ let geometryMeshFrustumEffect = new GeometryMeshFrustumEffect({
|
|
|
+ view:m_view,
|
|
|
+ m_map,
|
|
|
+ height:params.height,
|
|
|
+ topRadius:params.topRadius,
|
|
|
+ bottomRadius:params.bottomRadius,
|
|
|
+ position:params.position
|
|
|
+ });
|
|
|
+ m_map.add(geometryMeshFrustumEffect.graphicsLayer);
|
|
|
+ }
|
|
|
+
|
|
|
// 路径冲突
|
|
|
function pathConflict(params){
|
|
|
|
|
@@ -1442,203 +1538,209 @@ export default {
|
|
|
};
|
|
|
socket.onmessage = (messageEvent) => {
|
|
|
let messages = JSON.parse(messageEvent.data).data;
|
|
|
- //发送消息
|
|
|
- bus.emit('SendMessage',{
|
|
|
- action:"RealTimeUAVList",
|
|
|
- data:{
|
|
|
- "message":messages
|
|
|
- }
|
|
|
- })
|
|
|
- messages.forEach(message => {
|
|
|
- message.routeInfoVO.speed = message.routeInfoVO.speed * 1 +(Math.random() * 2).toFixed(2) * 1
|
|
|
- if(message.overall == "SAFE"){
|
|
|
- addGraphics({
|
|
|
- "id": message.uavid+'_conflict',
|
|
|
- "status": "hide"
|
|
|
- });
|
|
|
- pathPipe({
|
|
|
- "id": message.uavid+'_conflict',
|
|
|
- "status": "hide"
|
|
|
- });
|
|
|
+ realFlyPointDataQueue.push(messages);
|
|
|
+ };
|
|
|
+ socket.onerror = (error) => {
|
|
|
+ console.error('WebSocket 出错:', error);
|
|
|
+ };
|
|
|
+
|
|
|
+ socket.onclose = () => {
|
|
|
+ console.log('WebSocket 连接已关闭');
|
|
|
+ };
|
|
|
+ }
|
|
|
+ };
|
|
|
+ connectWebSocket();
|
|
|
+ processRealFlyPointData();
|
|
|
+ }
|
|
|
+
|
|
|
+ //如果是等待,就要设置另一台无人机继续飞行
|
|
|
+ function processRealFlyPointData(){
|
|
|
+ setInterval(() => {
|
|
|
+ if (realFlyPointDataQueue.length > 0) {
|
|
|
+ const messages = realFlyPointDataQueue.shift(); // 从队列中取出数据
|
|
|
+ //发送消息
|
|
|
+ bus.emit('SendMessage',{
|
|
|
+ action:"RealTimeUAVList",
|
|
|
+ data:{
|
|
|
+ "message":messages
|
|
|
+ }
|
|
|
+ })
|
|
|
+ messages.forEach(message => {
|
|
|
+ message.routeInfoVO.speed = message.routeInfoVO.speed * 1 +(Math.random() * 2).toFixed(2) * 1
|
|
|
+ if(message.overall == "SAFE"){
|
|
|
+ addGraphics({
|
|
|
+ "id": message.uavid+'_conflict',
|
|
|
+ "status": "hide"
|
|
|
+ });
|
|
|
+ pathPipe({
|
|
|
+ "id": message.uavid+'_conflict',
|
|
|
+ "status": "hide"
|
|
|
+ });
|
|
|
+ flyGLTF({
|
|
|
+ id:message.id,
|
|
|
+ uavid:message.uavid,
|
|
|
+ status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
+ //duration:message.time + 100,
|
|
|
+ duration:2500,
|
|
|
+ point:message.position_cj,
|
|
|
+ uavInfo: {
|
|
|
+ type:"safe",
|
|
|
+ data:message.routeInfoVO,
|
|
|
+ origin:message.routeInfoVO
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ if(message.nearestAircraft.status !="SAFE"){ //碰撞
|
|
|
flyGLTF({
|
|
|
id:message.id,
|
|
|
uavid:message.uavid,
|
|
|
status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
//duration:message.time + 100,
|
|
|
- duration:2100,
|
|
|
+ duration:2500,
|
|
|
point:message.position_cj,
|
|
|
uavInfo: {
|
|
|
- type:"safe",
|
|
|
- data:message.routeInfoVO,
|
|
|
- origin:message.routeInfoVO
|
|
|
+ type:"conflict",
|
|
|
+ action:message.routeInfoVO.avoidanceType,
|
|
|
+ data:message.routeInfoVO.avoidanceType == "wait" ?message.nearestAircraft:message.routeInfoVO,
|
|
|
+ origin:{
|
|
|
+ ...message.nearestAircraft,
|
|
|
+ ...message.routeInfoVO
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
+ addGraphics({
|
|
|
+ id: message.uavid+'_conflict',
|
|
|
+ status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
+ data: {
|
|
|
+ "geometry": { "type": "point", "x": message.nearestAircraft.conflictPoint[0], "y": message.nearestAircraft.conflictPoint[1], "z": message.nearestAircraft.conflictPoint[2] },
|
|
|
+ "attributes": { "name": "碰撞点位" }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ pathPipe({
|
|
|
+ "id": message.uavid+'_conflict',
|
|
|
+ "status": message.routeInfoVO.status == 3?"hide":"show",
|
|
|
+ "paths":[message.nearestAircraft.conflictPath],
|
|
|
+ "color": "#FF0000",
|
|
|
+ "intensity": 1.5,
|
|
|
+ "pipeRadius": 10
|
|
|
+ });
|
|
|
}else{
|
|
|
- if(message.nearestAircraft.status !="SAFE"){ //碰撞
|
|
|
+ addGraphics({
|
|
|
+ "id": message.uavid+'_conflict',
|
|
|
+ "status": "hide"
|
|
|
+ });
|
|
|
+ pathPipe({
|
|
|
+ "id": message.uavid+'_conflict',
|
|
|
+ "status": "hide"
|
|
|
+ });
|
|
|
+ // if(message.noFlyZone.status != "SAFE"){
|
|
|
+ // console.log("禁飞区预警",message);
|
|
|
+ // flyGLTF({
|
|
|
+ // id:message.id,
|
|
|
+ // uavid:message.uavid,
|
|
|
+ // status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
+ // //duration:message.time + 100,
|
|
|
+ // duration:2100,
|
|
|
+ // point:message.position_cj,
|
|
|
+ // uavInfo: {
|
|
|
+ // type:"noFlyZone",
|
|
|
+ // data:message.routeInfoVO,
|
|
|
+ // origin:message.routeInfoVO
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }else
|
|
|
+
|
|
|
+ if(message.routeDeviate.status != "SAFE" && message.routeDeviate.distance * 1 > 14){
|
|
|
+ console.log("偏航异常预警",message);
|
|
|
flyGLTF({
|
|
|
id:message.id,
|
|
|
uavid:message.uavid,
|
|
|
status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
//duration:message.time + 100,
|
|
|
- duration:2100,
|
|
|
+ duration:2500,
|
|
|
point:message.position_cj,
|
|
|
uavInfo: {
|
|
|
- type:"conflict",
|
|
|
- action:message.routeInfoVO.avoidanceType,
|
|
|
- data:message.routeInfoVO.avoidanceType == "wait" ?message.nearestAircraft:message.routeInfoVO,
|
|
|
+ type:"routeDeviate",
|
|
|
+ data:message.routeDeviate,
|
|
|
+ index:message.index,
|
|
|
origin:{
|
|
|
- ...message.nearestAircraft,
|
|
|
+ ...message.routeDeviate,
|
|
|
...message.routeInfoVO
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
- addGraphics({
|
|
|
- id: message.uavid+'_conflict',
|
|
|
+ }
|
|
|
+ // else if(message.electricityWarning.status != "SAFE"){
|
|
|
+ // console.log("电量异常预警",message);
|
|
|
+ // flyGLTF({
|
|
|
+ // id:message.id,
|
|
|
+ // uavid:message.uavid,
|
|
|
+ // status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
+ // //duration:message.time + 100,
|
|
|
+ // duration:2100,
|
|
|
+ // point:message.position_cj,
|
|
|
+ // uavInfo: {
|
|
|
+ // type:"electricityWarning",
|
|
|
+ // data:message.electricityWarning,
|
|
|
+ // origin:message.routeInfoVO
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // else if(message.collision.status != "SAFE"){
|
|
|
+ // console.log("建筑物过近异常信息",message);
|
|
|
+ // flyGLTF({
|
|
|
+ // id:message.id,
|
|
|
+ // uavid:message.uavid,
|
|
|
+ // status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
+ // //duration:message.time + 100,
|
|
|
+ // duration:2100,
|
|
|
+ // point:message.position_cj,
|
|
|
+ // uavInfo: {
|
|
|
+ // type:"collision",
|
|
|
+ // data:message.collision,
|
|
|
+ // origin:message.routeInfoVO
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+
|
|
|
+ // else if(message.clearZone.status != "SAFE"){
|
|
|
+ // console.log("净空区异常预警",message);
|
|
|
+ // flyGLTF({
|
|
|
+ // id:message.id,
|
|
|
+ // uavid:message.uavid,
|
|
|
+ // status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
+ // //duration:message.time + 100,
|
|
|
+ // duration:2100,
|
|
|
+ // point:message.position_cj,
|
|
|
+ // uavInfo: {
|
|
|
+ // type:"clearZone",
|
|
|
+ // data:message.clearZone,
|
|
|
+ // origin:message.routeInfoVO
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ else{
|
|
|
+ flyGLTF({
|
|
|
+ id:message.id,
|
|
|
+ uavid:message.uavid,
|
|
|
status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
- data: {
|
|
|
- "geometry": { "type": "point", "x": message.nearestAircraft.conflictPoint[0], "y": message.nearestAircraft.conflictPoint[1], "z": message.nearestAircraft.conflictPoint[2] },
|
|
|
- "attributes": { "name": "碰撞点位" }
|
|
|
- }
|
|
|
- });
|
|
|
- pathPipe({
|
|
|
- "id": message.uavid+'_conflict',
|
|
|
- "status": message.routeInfoVO.status == 3?"hide":"show",
|
|
|
- "paths":[message.nearestAircraft.conflictPath],
|
|
|
- "color": "#FF0000",
|
|
|
- "intensity": 1.5,
|
|
|
- "pipeRadius": 10
|
|
|
- });
|
|
|
- }else{
|
|
|
- addGraphics({
|
|
|
- "id": message.uavid+'_conflict',
|
|
|
- "status": "hide"
|
|
|
- });
|
|
|
- pathPipe({
|
|
|
- "id": message.uavid+'_conflict',
|
|
|
- "status": "hide"
|
|
|
+ //duration:message.time + 100,
|
|
|
+ duration:2500,
|
|
|
+ point:message.position_cj,
|
|
|
+ uavInfo: {
|
|
|
+ type:"safe",
|
|
|
+ data:message.routeInfoVO,
|
|
|
+ origin:message.routeInfoVO
|
|
|
+ }
|
|
|
});
|
|
|
- // if(message.noFlyZone.status != "SAFE"){
|
|
|
- // console.log("禁飞区预警",message);
|
|
|
- // flyGLTF({
|
|
|
- // id:message.id,
|
|
|
- // uavid:message.uavid,
|
|
|
- // status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
- // //duration:message.time + 100,
|
|
|
- // duration:2100,
|
|
|
- // point:message.position_cj,
|
|
|
- // uavInfo: {
|
|
|
- // type:"noFlyZone",
|
|
|
- // data:message.routeInfoVO,
|
|
|
- // origin:message.routeInfoVO
|
|
|
- // }
|
|
|
- // });
|
|
|
- // }else
|
|
|
-
|
|
|
- if(message.routeDeviate.status != "SAFE" && message.routeDeviate.distance * 1 > 14){
|
|
|
- console.log("偏航异常预警",message);
|
|
|
- flyGLTF({
|
|
|
- id:message.id,
|
|
|
- uavid:message.uavid,
|
|
|
- status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
- //duration:message.time + 100,
|
|
|
- duration:2100,
|
|
|
- point:message.position_cj,
|
|
|
- uavInfo: {
|
|
|
- type:"routeDeviate",
|
|
|
- data:message.routeDeviate,
|
|
|
- index:message.index,
|
|
|
- origin:{
|
|
|
- ...message.routeDeviate,
|
|
|
- ...message.routeInfoVO
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- // else if(message.electricityWarning.status != "SAFE"){
|
|
|
- // console.log("电量异常预警",message);
|
|
|
- // flyGLTF({
|
|
|
- // id:message.id,
|
|
|
- // uavid:message.uavid,
|
|
|
- // status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
- // //duration:message.time + 100,
|
|
|
- // duration:2100,
|
|
|
- // point:message.position_cj,
|
|
|
- // uavInfo: {
|
|
|
- // type:"electricityWarning",
|
|
|
- // data:message.electricityWarning,
|
|
|
- // origin:message.routeInfoVO
|
|
|
- // }
|
|
|
- // });
|
|
|
- // }
|
|
|
- // else if(message.collision.status != "SAFE"){
|
|
|
- // console.log("建筑物过近异常信息",message);
|
|
|
- // flyGLTF({
|
|
|
- // id:message.id,
|
|
|
- // uavid:message.uavid,
|
|
|
- // status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
- // //duration:message.time + 100,
|
|
|
- // duration:2100,
|
|
|
- // point:message.position_cj,
|
|
|
- // uavInfo: {
|
|
|
- // type:"collision",
|
|
|
- // data:message.collision,
|
|
|
- // origin:message.routeInfoVO
|
|
|
- // }
|
|
|
- // });
|
|
|
- // }
|
|
|
-
|
|
|
- // else if(message.clearZone.status != "SAFE"){
|
|
|
- // console.log("净空区异常预警",message);
|
|
|
- // flyGLTF({
|
|
|
- // id:message.id,
|
|
|
- // uavid:message.uavid,
|
|
|
- // status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
- // //duration:message.time + 100,
|
|
|
- // duration:2100,
|
|
|
- // point:message.position_cj,
|
|
|
- // uavInfo: {
|
|
|
- // type:"clearZone",
|
|
|
- // data:message.clearZone,
|
|
|
- // origin:message.routeInfoVO
|
|
|
- // }
|
|
|
- // });
|
|
|
- // }
|
|
|
- else{
|
|
|
- flyGLTF({
|
|
|
- id:message.id,
|
|
|
- uavid:message.uavid,
|
|
|
- status:message.routeInfoVO.status == 3?"hide":"show",
|
|
|
- //duration:message.time + 100,
|
|
|
- duration:2100,
|
|
|
- point:message.position_cj,
|
|
|
- uavInfo: {
|
|
|
- type:"safe",
|
|
|
- data:message.routeInfoVO,
|
|
|
- origin:message.routeInfoVO
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
- })
|
|
|
-
|
|
|
- };
|
|
|
-
|
|
|
- socket.onerror = (error) => {
|
|
|
- console.error('WebSocket 出错:', error);
|
|
|
- };
|
|
|
-
|
|
|
- socket.onclose = () => {
|
|
|
- console.log('WebSocket 连接已关闭');
|
|
|
- };
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ console.log("No data to process.");
|
|
|
}
|
|
|
- };
|
|
|
- connectWebSocket();
|
|
|
- }
|
|
|
-
|
|
|
- //如果是等待,就要设置另一台无人机继续飞行
|
|
|
- function conflict_wait(){
|
|
|
-
|
|
|
+ }, 2500); // 每3秒处理一次数据
|
|
|
}
|
|
|
|
|
|
function conflict_fly(params){
|
|
@@ -1743,20 +1845,21 @@ export default {
|
|
|
let size = params.size;
|
|
|
let fields = params.fields;
|
|
|
currentShowGridId = id;
|
|
|
- showThreeCubeDetail({
|
|
|
- id:id,
|
|
|
- status:"hide"
|
|
|
- });
|
|
|
- showThreeCubeDetail({
|
|
|
- id:lastId,
|
|
|
- status:"hide"
|
|
|
- });
|
|
|
if(status == "hide"){
|
|
|
+ showThreeCubeDetail({
|
|
|
+ id:params.id,
|
|
|
+ status:"hide"
|
|
|
+ });
|
|
|
+ showThreeCubeDetail({
|
|
|
+ id:params.lastId,
|
|
|
+ status:"hide"
|
|
|
+ });
|
|
|
currentShowGridId = null;
|
|
|
return
|
|
|
}
|
|
|
getSixPowerPoints({
|
|
|
id,
|
|
|
+ lastId,
|
|
|
"x": center.x,
|
|
|
"y": center.y,
|
|
|
status,
|
|
@@ -1782,6 +1885,14 @@ export default {
|
|
|
fields: params.fields,
|
|
|
scrollId: params.scrollId,
|
|
|
}).then(res =>{
|
|
|
+ showThreeCubeDetail({
|
|
|
+ id:params.id,
|
|
|
+ status:"hide"
|
|
|
+ });
|
|
|
+ showThreeCubeDetail({
|
|
|
+ id:params.lastId,
|
|
|
+ status:"hide"
|
|
|
+ });
|
|
|
if(currentShowGridId == params.id){
|
|
|
if(res.data.data.list?.length >= 100000 && res.data.data.scrollId){
|
|
|
// res.data.data.list.forEach((point) =>{
|
|
@@ -1816,6 +1927,7 @@ export default {
|
|
|
|
|
|
//需要添加初始路径(手动绘制和自动绘制)结果
|
|
|
function draw(params){
|
|
|
+ debugger
|
|
|
let id = params.id;
|
|
|
let geometryType = params.type;
|
|
|
let status = params.status;
|