工作计划取消AI算法后问题

main
徐景良 2 months ago
parent 627244578c
commit 81b6e7aa94

@ -176,7 +176,7 @@
<div class="unit"> m/s</div>
</div>
<!--
<div class="item">
<div class="label">航点类型
<a-tooltip placement="topLeft" >
@ -209,9 +209,9 @@
<a-select-option value="distance">平滑过点提前转弯</a-select-option>
</a-select>
</div>
</div>
</div> -->
<div class="item">
<!-- <div class="item">
<div class="label">飞行器偏航角模式
<a-tooltip placement="topLeft" >
<template #title>
@ -236,9 +236,9 @@
<a-select-option value="distance">锁定当前偏航角</a-select-option>
</a-select>
</div>
</div>
</div> -->
<div class="item">
<!-- <div class="item">
<div class="label">航点间云台俯仰角控制模式
<a-tooltip placement="topLeft">
<template #title>
@ -263,7 +263,7 @@
<a-select-option value="time">依照每个航点设置</a-select-option>
</a-select>
</div>
</div>
</div> -->
<div class="item flex-column">

@ -590,6 +590,7 @@
(newVal, oldVal) => {
submitForm.value.taskAirLineName = newVal.airLineName;
submitForm.value.airLineId = newVal.id;
setDefaultHeight(submitForm.value.airLineId);
},
);
@ -666,14 +667,14 @@
value: 0,
label: '返航',
},
{
value: 1,
label: '悬停',
},
{
value: 2,
label: '降落',
},
// {
// value: 1,
// label: '',
// },
// {
// value: 2,
// label: '',
// },
]);
//
@ -738,6 +739,7 @@
...submitForm.value,
...patrol.value,
};
addTask(query).then((res) => {
if (res) {
message.success('操作成功!');
@ -877,8 +879,11 @@
submitForm.value.periodicFormula = cronTime;
};
const changeAiInspection = (val) => {
if (val) {
emit('intelligentPatrol');
}else{
submitForm.value.aiInspection = null;
}
};
@ -906,6 +911,32 @@
}
};
// 线
const setDefaultHeight = async (id) => {
let airLine = await getAirLine({ airLineId: id });
try {
let response = await axios.get(airLine.wpml, { responseType: 'arraybuffer' });
// kmz
let xmlStr = await extractKmz(response.data);
// wpml
let removeWpmlXmlStr = {
template: xmlStr.template.replace(/wpml:/g, ''),
wayline: xmlStr.wayline.replace(/wpml:/g, ''),
};
// josn
const parser = new XMLParser();
let xmlObj = {
template: parser.parse(removeWpmlXmlStr.template),
wayline: parser.parse(removeWpmlXmlStr.wayline),
};
if(xmlObj.template.kml.Document.missionConfig.globalRTHHeight){
submitForm.value.returnAltitude = xmlObj.template.kml.Document.missionConfig.globalRTHHeight
}
} catch (e) {
console.error(e);
}
};
const extractKmz = async (kmzBlob) => {
const zip = new JSZip();
const contents = await zip.loadAsync(kmzBlob);

@ -65,41 +65,41 @@ export const airPointActions = {
}
},
"orientedShoot":{ // 定向拍照
"name":"定向拍照",
"value":"orientedShoot",
"type":"action",
"config":{
"actionId": null,
"actionActuatorFunc": "orientedShoot",
"actionActuatorFuncParam": {
"gimbalPitchRotateAngle": 0,
"gimbalRollRotateAngle": 0,
"gimbalYawRotateAngle": 0,
"focusX": 0,
"focusY": 0,
"focusRegionWidth": 0,
"focusRegionHeight": 0,
"focalLength": 24,
"aircraftHeading": 0,
"accurateFrameValid": 0,
"payloadPositionIndex": 0,
"useGlobalPayloadLensIndex": 1,
"payloadLensIndex": "visable,ir",
"targetAngle": 0,
"actionUUID": "beb19eb4-84ff-4a5e-8544-47646d63a361",
"imageWidth": 0,
"imageHeight": 0,
"AFPos": 0,
"gimbalPort": 0,
"orientedCameraType": 99,
"orientedFilePath": "fa7781b7-665a-4d78-a9da-250d202a1522",
"orientedFileMD5": "",
"orientedFileSize": 0,
"orientedPhotoMode": "normalPhoto"
}
}
},
// "orientedShoot":{ // 定向拍照
// "name":"定向拍照",
// "value":"orientedShoot",
// "type":"action",
// "config":{
// "actionId": null,
// "actionActuatorFunc": "orientedShoot",
// "actionActuatorFuncParam": {
// "gimbalPitchRotateAngle": 0,
// "gimbalRollRotateAngle": 0,
// "gimbalYawRotateAngle": 0,
// "focusX": 0,
// "focusY": 0,
// "focusRegionWidth": 0,
// "focusRegionHeight": 0,
// "focalLength": 24,
// "aircraftHeading": 0,
// "accurateFrameValid": 0,
// "payloadPositionIndex": 0,
// "useGlobalPayloadLensIndex": 1,
// "payloadLensIndex": "visable,ir",
// "targetAngle": 0,
// "actionUUID": "beb19eb4-84ff-4a5e-8544-47646d63a361",
// "imageWidth": 0,
// "imageHeight": 0,
// "AFPos": 0,
// "gimbalPort": 0,
// "orientedCameraType": 99,
// "orientedFilePath": "fa7781b7-665a-4d78-a9da-250d202a1522",
// "orientedFileMD5": "",
// "orientedFileSize": 0,
// "orientedPhotoMode": "normalPhoto"
// }
// }
// },
"panoShot":{ // 全景拍照
"name":"全景拍照",
@ -178,57 +178,57 @@ export const airPointActions = {
}
}
},
"multipleTiming":{ // 开始等时间间隔拍照
"name":"开始等时间间隔拍照",
"value":"multipleTiming",
"type":"actionGroup",
"config":{
"actionGroupId": null,
"actionGroupStartIndex": null,
"actionGroupEndIndex": null,
"actionGroupMode": "sequence",
"actionTrigger": {
"actionTriggerType": "multipleTiming",
"actionTriggerParam": 3
},
"action": {
"actionId": 0,
"actionActuatorFunc": "takePhoto",
"actionActuatorFuncParam": {
"payloadPositionIndex": 0,
"useGlobalPayloadLensIndex": 1,
"payloadLensIndex": "visable,ir"
}
}
}
},
"multipleDistance":{ // 开始等距离间隔拍照
"name":"开始等距离间隔拍照",
"value":"multipleDistance",
"type":"actionGroup",
"config":{
"actionGroupId": null,
"actionGroupStartIndex": null,
"actionGroupEndIndex": null,
"actionGroupMode": "sequence",
"actionTrigger": {
"actionTriggerType": "multipleDistance",
"actionTriggerParam": 10
},
"action": {
"actionId": 0,
"actionActuatorFunc": "takePhoto",
"actionActuatorFuncParam": {
"payloadPositionIndex": 0,
"useGlobalPayloadLensIndex": 1,
"payloadLensIndex": "visable,ir"
}
}
}
},
"multipleStop":{
"name":"停止间隔拍照",
"value":"multipleStop",
"type":"endMark"
}
// "multipleTiming":{ // 开始等时间间隔拍照
// "name":"开始等时间间隔拍照",
// "value":"multipleTiming",
// "type":"actionGroup",
// "config":{
// "actionGroupId": null,
// "actionGroupStartIndex": null,
// "actionGroupEndIndex": null,
// "actionGroupMode": "sequence",
// "actionTrigger": {
// "actionTriggerType": "multipleTiming",
// "actionTriggerParam": 3
// },
// "action": {
// "actionId": 0,
// "actionActuatorFunc": "takePhoto",
// "actionActuatorFuncParam": {
// "payloadPositionIndex": 0,
// "useGlobalPayloadLensIndex": 1,
// "payloadLensIndex": "visable,ir"
// }
// }
// }
// },
// "multipleDistance":{ // 开始等距离间隔拍照
// "name":"开始等距离间隔拍照",
// "value":"multipleDistance",
// "type":"actionGroup",
// "config":{
// "actionGroupId": null,
// "actionGroupStartIndex": null,
// "actionGroupEndIndex": null,
// "actionGroupMode": "sequence",
// "actionTrigger": {
// "actionTriggerType": "multipleDistance",
// "actionTriggerParam": 10
// },
// "action": {
// "actionId": 0,
// "actionActuatorFunc": "takePhoto",
// "actionActuatorFuncParam": {
// "payloadPositionIndex": 0,
// "useGlobalPayloadLensIndex": 1,
// "payloadLensIndex": "visable,ir"
// }
// }
// }
// },
// "multipleStop":{
// "name":"停止间隔拍照",
// "value":"multipleStop",
// "type":"endMark"
// }
}

@ -7,7 +7,7 @@ export const templateKml123 = {
"missionConfig": {
"flyToWaylineMode": "pointToPoint",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"takeOffRefPoint": "35.134383,118.302109,74.787731",
@ -93,7 +93,7 @@ export const templateKml = {
"missionConfig": {
"flyToWaylineMode": "pointToPoint",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"takeOffRefPoint": "35.134588,118.296655,69.9",
@ -169,7 +169,7 @@ export const waylineWpml = {
"missionConfig": {
"flyToWaylineMode": "pointToPoint",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"globalTransitionalSpeed": 15,

@ -7,7 +7,7 @@ export const templateKml = {
"missionConfig": {
"flyToWaylineMode": "safely",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"takeOffRefPoint": "35.134614,118.296656,77.867669",
@ -64,7 +64,7 @@ export const waylineWpml = {
"missionConfig": {
"flyToWaylineMode": "safely",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"globalTransitionalSpeed": 15,

@ -7,7 +7,7 @@ export const templateKml = {
"missionConfig": {
"flyToWaylineMode": "pointToPoint",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"takeOffRefPoint": "",
@ -91,7 +91,7 @@ export const waylineWpml = {
"missionConfig": {
"flyToWaylineMode": "pointToPoint",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"globalTransitionalSpeed": 15,

@ -4,7 +4,7 @@
"missionConfig": {
"flyToWaylineMode": "safely",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"globalTransitionalSpeed": 15,

@ -69,19 +69,21 @@ export const missionConfigOptions = {
{
label:"返航",
value:"goHome"
},{
label:"原地降落",
value:"autoLand"
},{
label:"返回起始点",
value:"gotoFirstWaypoint"
}
// ,{
// label:"原地降落",
// value:"autoLand"
// },{
// label:"返回起始点",
// value:"gotoFirstWaypoint"
// }
],
exitOnRCLost:[ // 失控是否继续执行航线
// {
// label:"继续执行航线",
// value:"goContinue"
// },
{
label:"继续执行航线",
value:"goContinue"
},{
label:"执行失控动作",
value:"executeLostAction"
}
@ -90,13 +92,14 @@ export const missionConfigOptions = {
{
label:"返航",
value:"goBack"
},{
label:"降落",
value:"landing"
},{
label:"悬停",
value:"hover"
}
// ,{
// label:"降落",
// value:"landing"
// },{
// label:"悬停",
// value:"hover"
// }
],
globalWaypointTurnMode:[
{

@ -7,7 +7,7 @@ export const templateKml = {
"missionConfig": {
"flyToWaylineMode": "safely",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"takeOffRefPoint": "35.134614,118.296656,77.867669",
@ -64,7 +64,7 @@ export const waylineWpml = {
"missionConfig": {
"flyToWaylineMode": "safely",
"finishAction": "goHome",
"exitOnRCLost": "goContinue",
"exitOnRCLost": "executeLostAction",
"executeRCLostAction": "goBack",
"takeOffSecurityHeight": 20,
"globalTransitionalSpeed": 15,

@ -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/registry.npmmirror.com+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
Loading…
Cancel
Save