低空修改250318-01

.env.production

@@ -1,8 +1,8 @@
-VITE_BASE_API='http://10.90.9.143:8095/low-altitude/'
-VITE_BASE_URL='http://10.90.9.143:8095/low-altitude/'
+VITE_BASE_API='http://172.16.8.41:9250/low-altitude/'
+VITE_BASE_URL='http://172.16.8.41:9250/low-altitude/'
 
 VITE_ZW_API='https://cimweb.zjw.sh.cegn.cn:2008/'
 VITE_ZW_URL='https://cimweb.zjw.sh.cegn.cn:2008/'
 
-VITE_NET_API='http://58.34.215.19:8095/low-altitude/'
-VITE_NET_URL='http://58.34.215.19:8095/low-altitude/'
+VITE_NET_API='http://172.16.8.41:9250/low-altitude/'
+VITE_NET_URL='http://172.16.8.41:9250/low-altitude/'

src/components/mapJK.vue

@@ -839,7 +839,7 @@ export default {
       //不同比例尺加载长三角瓦片
       function showTileLayersWithScaleEventsReturn(scaleValue){
         let layer = m_map.layers.find(item => item.id === "BaseMapCSJYaoGan");
-        if(scaleValue < 130000){
+        if(scaleValue < 150000){
           if(layer){
             layer.visible = false;
           }
@@ -1920,7 +1920,7 @@ export default {
             if(virtualSocket){
               virtualSocket.send(JSON.stringify(params.flyList));
             }else{
-              virtualSocket = new WebSocket('ws://58.34.215.19:8100/low-altitude/simulate/getRouteInfoWebSocket');
+              virtualSocket = new WebSocket('ws://172.16.8.41:9250/low-altitude/simulate/getRouteInfoWebSocket');
               virtualSocket.onopen = () => {
                 console.log('WebSocket 连接成功');
                 virtualSocket.send(JSON.stringify(params.flyList));
@@ -1968,7 +1968,7 @@ export default {
           if(socket){
             socket.send(JSON.stringify(params.flyList));
           }else{
-            socket = new WebSocket('ws://58.34.215.19:8100/low-altitude/aircraftRouteSpeedWebSocket');
+            socket = new WebSocket('ws://172.16.8.41:9250/low-altitude/aircraftRouteSpeedWebSocket');
             socket.onopen = () => {
               console.log('WebSocket 连接成功');
               socket.send(JSON.stringify(params.flyList));
@@ -2215,7 +2215,7 @@ export default {
       //ws 推送方法
       function getRealPower(params){
         const connectWebSocket = () => {
-          socket = new WebSocket('ws://58.34.215.19:8100/low-altitude/gridSearchWebSocket');
+          socket = new WebSocket('ws://172.16.8.41:9250/low-altitude/gridSearchWebSocket');
           socket.onopen = () => {
             console.log('WebSocket 连接成功');
             socket.send(JSON.stringify({
@@ -2754,7 +2754,7 @@ export default {
                   "isShow": true
               }));
             }else{
-              flyPointSocket = new WebSocket('ws://58.34.215.19:8100/low-altitude/flight/data/websocket');
+              flyPointSocket = new WebSocket('ws://172.16.8.41:9250/low-altitude/flight/data/websocket');
               flyPointSocket.onopen = () => {
                 console.log('WebSocket 连接成功');
               };
@@ -3117,6 +3117,8 @@ export default {
         }).then(res =>{
           //处理返回网格结果
           feedbackCubeResult(params,res)
+        }).catch(()=>{
+          feedbackErrorResult()
         })
       }
 
@@ -3164,6 +3166,8 @@ export default {
         }).then(res =>{
           //处理返回网格结果
           feedbackCubeResult(params,res)
+        }).catch(()=>{
+          feedbackErrorResult()
         })
       }
 
@@ -3206,6 +3210,8 @@ export default {
         }).then(res =>{
           //处理返回网格结果
           feedbackCubeResult(params,res)
+        }).catch(()=>{
+          feedbackErrorResult()
         })
       }
 
@@ -3308,6 +3314,8 @@ export default {
         }).then(res =>{
           //处理返回网格结果
           feedbackCubeResult(params,res)
+        }).catch(()=>{
+          feedbackErrorResult()
         })
       }
 
@@ -3358,19 +3366,21 @@ export default {
           //处理返回网格结果
           debugger
           feedbackCubeResult(params,res);
+        }).catch(()=>{
+          feedbackErrorResult()
         })
       }
 
       function feedbackCubeResult(params,res){
-        // bus.emit('SendMessage',{
-        //   action:"CubeResult",
-        //   data:{
-        //     "message":{
-        //       "time":new Date().getTime(),
-        //       "data":res.data.data.gridConflict
-        //     }
-        //   }
-        // })
+        bus.emit('SendMessage',{
+          action:"CubeResult",
+          data:{
+            "message":{
+              "time":new Date().getTime(),
+              "data":"success"
+            }
+          }
+        })
         if(res.data.data?.list?.length>0){
           showThreeCubeDetail({
             "id":params.id+ "23",
@@ -3399,6 +3409,18 @@ export default {
         }
       }
 
+      function feedbackErrorResult(){
+        bus.emit('SendMessage',{
+          action:"CubeResult",
+          data:{
+            "message":{
+              "time":new Date().getTime(),
+              "data":"error"
+            }
+          }
+        })
+      }
+
 
       function getBasePrism(params){
         getPrism({

src/components/mapTest.vue

@@ -75,8 +75,8 @@ export default {
       bridge = new CityGIS.Bridge({
         id:"i_map",
         //url:'https://cimweb.zjw.sh.cegn.cn:2007/map-tool-widget/#/jk_map',
-        url:'http://localhost:5173/map-tool-widget/#/jk_map',
-        //url: 'http://58.34.215.19:8095/map-tool-widget/#/jk_map',
+        //url:'http://localhost:5173/map-tool-widget/#/jk_map',
+        url: 'http://172.16.8.41:9250/map-tool-widget/#/jk_map',
         onReady:function (){
           // console.log("地图创建完成");
         }

src/main.js

@@ -6,8 +6,8 @@ import '@arcgis/core/assets/esri/themes/dark/main.css'
 import router from "./router/index.js";
 import './assets/global.scss'
 import esriConfig from  '@arcgis/core/config.js'
-esriConfig.assetsPath = '/public/assets';
-//esriConfig.assetsPath = '/map-tool-widget/assets';
+//esriConfig.assetsPath = '/public/assets';
+esriConfig.assetsPath = '/map-tool-widget/assets';
 import mitt from 'mitt'
 app.use(ElementPlus, {
     locale: zhCn,

vite.config.js

@@ -39,7 +39,7 @@ export default defineConfig({
       },
       '/netapi': {
         // 代理请求之后的请求地址（你的真实接口地址)
-        target: 'http://58.34.215.19:8095/low-altitude/',
+        target: 'http://172.16.8.41:9250/low-altitude/',
         //target: 'http://10.1.161.53:8095/',
         //target: 'http://localhost:9250/',
         secure: false,