merge

src/utils/mqtt.ts

@@ -73,6 +73,7 @@ const createConnection = (callback?) => {
         addOrUpdateRedisUser(querys);
       }
       const { protocol, host, port, endpoint, ...options } = connection;
+      console.log("options123",options);
       const connectUrl = `${protocol}://${host}:${port}${endpoint}`;
       client = mqtt.connect(connectUrl, options);
       client.on('connect', () => {

src/views/demo/workmanagement/workplan/components/map.vue

@@ -714,7 +714,6 @@
     'changeAirportLive',
     'changeUAVLive',
     'areaData',
-    'takeOff',
   ]);
 
   const airPoints = ref([]);
@@ -1187,73 +1186,7 @@
       if (props.polygonArea) {
         handlerReportPolygonAirLine();
       }
-      EventBus.on('flyTobtn', (val: any) => {
-        map.on('click', (e) => {
-          let res = handlerGetLngLatHeight(e);
-          res.alt = res.alt + 80;
-          flyToThere(e);
-          // 无人机点
-          const graphic = new mars3d.graphic.BillboardEntity({
-            id: 'flytothere-uav',
-            name: '标点',
-            position: [res.lng, res.lat, res.alt],
-            style: {
-              image: '/map/uav-mark.png',
-              scale: 0.3,
-              horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-              verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-              label: {
-                text: '',
-                font_size: 14,
-                color: '#ffffff',
-                outline: true,
-                outlineColor: '#000000',
-                pixelOffsetY: -40,
-              },
-            },
-          });
-          uavGraphicLayer.addGraphic(graphic);
-          // 贴地点
-          const stickGraphic = new mars3d.graphic.PointEntity({
-            id: 'flytothere-stick',
-            position: [res.lng, res.lat],
-            style: {
-              color: '#f5f5f5',
-              pixelSize: 8,
-              outline: true,
-              outlineColor: '#f5f5f5',
-              outlineWidth: 1,
-              clampToGround: true,
-            },
-          });
 
-          stickGraphic.on(mars3d.EventType.editMouseMove, (e) => {
-            const cartographic = mars3d.Cesium.Cartographic.fromCartesian(e.cartesian);
-            // 弧度转度数
-            const longitude = mars3d.Cesium.Math.toDegrees(cartographic.longitude);
-            const latitude = mars3d.Cesium.Math.toDegrees(cartographic.latitude);
-            const height = cartographic.height; // 高度（米）
-            stickGraphicMove([longitude, latitude, height]);
-          });
-          stickGraphicLayer.addGraphic(stickGraphic);
-
-          // 连接线
-          let connectLine = new mars3d.graphic.PolylineEntity({
-            id: 'flytothere-line',
-            positions: [
-              [res.lng, res.lat, res.alt],
-              [res.lng, res.lat, 0],
-            ],
-            style: {
-              color: '#f5f5f5',
-              width: 1,
-            },
-          });
-          uavGraphicLayer.addGraphic(connectLine);
-
-          EventBus.emit('obtainTheLocation', res);
-        });
-      });
       emits('mapOnLoad', map);
     });
   };
@@ -3176,9 +3109,6 @@
           },
         },
       });
-      flyStartGraphic.on(mars3d.EventType.click, function (event) {
-        emits('takeOff');
-      });
       graphicLayer.addGraphic(flyStartGraphic);
     }
     ariPortOldData.value = props.airPort.height;
@@ -3268,6 +3198,7 @@
   const setUAVPosition = () => {
     let point = graphicLayer.getGraphicById('set-uav');
     const position = [props.uavTrack.longitude, props.uavTrack.latitude, props.uavTrack.height];
+    console.log('point', point);
     // 更新航点
     if (point) {
       point.setOptions({

vite.config.ts.timestamp-1767929899983-51337c4d00ff7.mjs

@@ -0,0 +1,67 @@
+// vite.config.ts
+import { defineApplicationConfig } from "file:///E:/projects/DiKongGanZhiPingTai/internal/vite-config/dist/index.mjs";
+import { mars3dPlugin } from "file:///E:/projects/DiKongGanZhiPingTai/node_modules/.pnpm/vite-plugin-mars3d@3.1.3_rollup@2.79.2/node_modules/vite-plugin-mars3d/dist/index.js";
+var vite_config_default = defineApplicationConfig({
+  overrides: {
+    optimizeDeps: {
+      include: [
+        "echarts/core",
+        "echarts/charts",
+        "echarts/components",
+        "echarts/renderers",
+        "qrcode",
+        "@iconify/iconify",
+        "ant-design-vue/es/locale/zh_CN",
+        "ant-design-vue/es/locale/en_US",
+        "@/../lib/vform/designer.umd.js"
+      ]
+    },
+    build: {
+      /* 其他build生产打包配置省略 */
+      //...
+      target: "esnext",
+      commonjsOptions: {
+        include: [/node_modules|lib/, /node_modules|packages/]
+        //这里记得把lib目录加进来，否则生产打包会报错！！
+      }
+    },
+    server: {
+      proxy: {
+        "/basic-api": {
+          target: "http://localhost:3000",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "")
+          // only https
+          // secure: false
+        },
+        "/upload": {
+          target: "http://localhost:3300/upload",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path) => path.replace(new RegExp(`^/upload`), "")
+        }
+      },
+      warmup: {
+        clientFiles: ["./index.html", "./src/{views,components}/*"]
+      }
+    },
+    define: {
+      "process.env": {
+        BASE_URL: "/"
+      }
+    },
+    css: {
+      preprocessorOptions: {
+        less: {
+          javascriptEnabled: true
+        }
+      }
+    },
+    plugins: [mars3dPlugin()]
+  }
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJFOlxcXFxwcm9qZWN0c1xcXFxEaUtvbmdHYW5aaGlQaW5nVGFpXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCJFOlxcXFxwcm9qZWN0c1xcXFxEaUtvbmdHYW5aaGlQaW5nVGFpXFxcXHZpdGUuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9FOi9wcm9qZWN0cy9EaUtvbmdHYW5aaGlQaW5nVGFpL3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5pbXBvcnQgeyBtYXJzM2RQbHVnaW4gfSBmcm9tICd2aXRlLXBsdWdpbi1tYXJzM2QnO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVBcHBsaWNhdGlvbkNvbmZpZyh7XG4gIG92ZXJyaWRlczoge1xuICAgIG9wdGltaXplRGVwczoge1xuICAgICAgaW5jbHVkZTogW1xuICAgICAgICAnZWNoYXJ0cy9jb3JlJyxcbiAgICAgICAgJ2VjaGFydHMvY2hhcnRzJyxcbiAgICAgICAgJ2VjaGFydHMvY29tcG9uZW50cycsXG4gICAgICAgICdlY2hhcnRzL3JlbmRlcmVycycsXG4gICAgICAgICdxcmNvZGUnLFxuICAgICAgICAnQGljb25pZnkvaWNvbmlmeScsXG4gICAgICAgICdhbnQtZGVzaWduLXZ1ZS9lcy9sb2NhbGUvemhfQ04nLFxuICAgICAgICAnYW50LWRlc2lnbi12dWUvZXMvbG9jYWxlL2VuX1VTJyxcbiAgICAgICAgJ0AvLi4vbGliL3Zmb3JtL2Rlc2lnbmVyLnVtZC5qcycsXG4gICAgICBdLFxuICAgIH0sXG4gICAgYnVpbGQ6IHtcbiAgICAgIC8qIFx1NTE3Nlx1NEVENmJ1aWxkXHU3NTFGXHU0RUE3XHU2MjUzXHU1MzA1XHU5MTREXHU3RjZFXHU3NzAxXHU3NTY1ICovXG4gICAgICAvLy4uLlxuICAgICAgdGFyZ2V0OiAnZXNuZXh0JyxcbiAgICAgIGNvbW1vbmpzT3B0aW9uczoge1xuICAgICAgICBpbmNsdWRlOiBbL25vZGVfbW9kdWxlc3xsaWIvLCAvbm9kZV9tb2R1bGVzfHBhY2thZ2VzL10sIC8vXHU4RkQ5XHU5MUNDXHU4QkIwXHU1Rjk3XHU2MjhBbGliXHU3NkVFXHU1RjU1XHU1MkEwXHU4RkRCXHU2NzY1XHVGRjBDXHU1NDI2XHU1MjE5XHU3NTFGXHU0RUE3XHU2MjUzXHU1MzA1XHU0RjFBXHU2MkE1XHU5NTE5XHVGRjAxXHVGRjAxXG4gICAgICB9LFxuICAgIH0sXG4gICAgc2VydmVyOiB7XG4gICAgICBwcm94eToge1xuICAgICAgICAnL2Jhc2ljLWFwaSc6IHtcbiAgICAgICAgICB0YXJnZXQ6ICdodHRwOi8vbG9jYWxob3N0OjMwMDAnLFxuICAgICAgICAgIGNoYW5nZU9yaWdpbjogdHJ1ZSxcbiAgICAgICAgICB3czogdHJ1ZSxcbiAgICAgICAgICByZXdyaXRlOiAocGF0aCkgPT4gcGF0aC5yZXBsYWNlKG5ldyBSZWdFeHAoYF4vYmFzaWMtYXBpYCksICcnKSxcbiAgICAgICAgICAvLyBvbmx5IGh0dHBzXG4gICAgICAgICAgLy8gc2VjdXJlOiBmYWxzZVxuICAgICAgICB9LFxuICAgICAgICAnL3VwbG9hZCc6IHtcbiAgICAgICAgICB0YXJnZXQ6ICdodHRwOi8vbG9jYWxob3N0OjMzMDAvdXBsb2FkJyxcbiAgICAgICAgICBjaGFuZ2VPcmlnaW46IHRydWUsXG4gICAgICAgICAgd3M6IHRydWUsXG4gICAgICAgICAgcmV3cml0ZTogKHBhdGgpID0+IHBhdGgucmVwbGFjZShuZXcgUmVnRXhwKGBeL3VwbG9hZGApLCAnJyksXG4gICAgICAgIH0sXG4gICAgICB9LFxuICAgICAgd2FybXVwOiB7XG4gICAgICAgIGNsaWVudEZpbGVzOiBbJy4vaW5kZXguaHRtbCcsICcuL3NyYy97dmlld3MsY29tcG9uZW50c30vKiddLFxuICAgICAgfSxcbiAgICB9LFxuICAgIGRlZmluZToge1xuICAgICAgJ3Byb2Nlc3MuZW52Jzoge1xuICAgICAgICBCQVNFX1VSTDogJy8nLFxuICAgICAgfSxcbiAgICB9LFxuICAgIGNzczoge1xuICAgICAgcHJlcHJvY2Vzc29yT3B0aW9uczoge1xuICAgICAgICBsZXNzOiB7XG4gICAgICAgICAgamF2YXNjcmlwdEVuYWJsZWQ6IHRydWUsXG4gICAgICAgIH0sXG4gICAgICB9LFxuICAgIH0sXG4gICAgcGx1Z2luczogW21hcnMzZFBsdWdpbigpXSxcbiAgfSxcbn0pO1xuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFxUixTQUFTLCtCQUErQjtBQUM3VCxTQUFTLG9CQUFvQjtBQUU3QixJQUFPLHNCQUFRLHdCQUF3QjtBQUFBLEVBQ3JDLFdBQVc7QUFBQSxJQUNULGNBQWM7QUFBQSxNQUNaLFNBQVM7QUFBQSxRQUNQO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsT0FBTztBQUFBO0FBQUE7QUFBQSxNQUdMLFFBQVE7QUFBQSxNQUNSLGlCQUFpQjtBQUFBLFFBQ2YsU0FBUyxDQUFDLG9CQUFvQix1QkFBdUI7QUFBQTtBQUFBLE1BQ3ZEO0FBQUEsSUFDRjtBQUFBLElBQ0EsUUFBUTtBQUFBLE1BQ04sT0FBTztBQUFBLFFBQ0wsY0FBYztBQUFBLFVBQ1osUUFBUTtBQUFBLFVBQ1IsY0FBYztBQUFBLFVBQ2QsSUFBSTtBQUFBLFVBQ0osU0FBUyxDQUFDLFNBQVMsS0FBSyxRQUFRLElBQUksT0FBTyxhQUFhLEdBQUcsRUFBRTtBQUFBO0FBQUE7QUFBQSxRQUcvRDtBQUFBLFFBQ0EsV0FBVztBQUFBLFVBQ1QsUUFBUTtBQUFBLFVBQ1IsY0FBYztBQUFBLFVBQ2QsSUFBSTtBQUFBLFVBQ0osU0FBUyxDQUFDLFNBQVMsS0FBSyxRQUFRLElBQUksT0FBTyxVQUFVLEdBQUcsRUFBRTtBQUFBLFFBQzVEO0FBQUEsTUFDRjtBQUFBLE1BQ0EsUUFBUTtBQUFBLFFBQ04sYUFBYSxDQUFDLGdCQUFnQiw0QkFBNEI7QUFBQSxNQUM1RDtBQUFBLElBQ0Y7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNOLGVBQWU7QUFBQSxRQUNiLFVBQVU7QUFBQSxNQUNaO0FBQUEsSUFDRjtBQUFBLElBQ0EsS0FBSztBQUFBLE1BQ0gscUJBQXFCO0FBQUEsUUFDbkIsTUFBTTtBQUFBLFVBQ0osbUJBQW1CO0FBQUEsUUFDckI7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsU0FBUyxDQUFDLGFBQWEsQ0FBQztBQUFBLEVBQzFCO0FBQ0YsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K