gitY
/
DiKongGanZhiPingTai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
main
刘妍 6 days ago
parent 441d69cdcd
commit 05540599b5
4 changed files with 153 additions and 96 deletions
Show Stats Download Patch File Download Diff File

48
src/views/demo/workmanagement/flightoperation/index.vue
Unescape Escape View File

@ -73,16 +73,17 @@
@changeCameraType="changeCameraType"
/>
<div class="intelligent-patrol" v-if="taskId">
<div @click="patrolVisible = true">
<div @click="patrolClick">
<span> <RadarChartOutlined /> </span>
<span>智能巡检</span>
<span v-if="stopPatrolVisible">停止巡检</span>
<span v-else>智能巡检</span>
</div>
<div @click="reportVisible = true">
<!-- <div @click="reportVisible = true">
<span> <AlertOutlined /></span>
<span>上报事件</span>
</div>
</div> -->
</div>
<Patrol :taskId="taskId" v-if="patrolVisible" @changePatrol="patrolVisible = false" />
<Patrol :taskId="taskId" v-if="patrolVisible" @changePatrol="changePatrol" :zIndex="zIndex" />
<Report @changeReport="reportVisible = false" v-if="reportVisible" />
</div>
</template>
@ -111,7 +112,10 @@
import { drcUpTopic, setTopic } from '@/utils/debugging/remote';
import { airPortStore } from '@/store/modules/airport';
import { AlertOutlined, RadarChartOutlined } from '@ant-design/icons-vue';
import { endHandFlyTask } from '@/api/workmanagement/droneDock';
import io from 'socket.io-client';
let socket;
const zIndex = ref(0);
const airPortStoreVal = airPortStore();
const airPortInfo = airPortStoreVal.getAirport;
@ -139,7 +143,40 @@
const topicUAVUrl = computed(() => {
return 'thing/product/' + UAVinfo.sn + '/osd';
});
const taskId = ref(airPortStoreVal.getTaskId);
const patrolClick = () => {
console.log('patrolClick', airPortStoreVal.getTaskId);
if (airPortStoreVal.getTaskId) {
endHandFlyTask({
taskid: airPortStoreVal.getTaskId,
}).then((res) => {
if (res) {
if (socket) {
socket.disconnect();
}
airPortStoreVal.setTaskId(null);
}
});
} else {
zIndex.value++;
patrolVisible.value = true;
}
};
const stopPatrolVisible = ref(false);
console.log('airPortStoreVal', airPortStoreVal.getTaskId);
if (airPortStoreVal.getTaskId) {
stopPatrolVisible.value = true;
}
const changePatrol = (val) => {
if (val) {
stopPatrolVisible.value = true;
}
patrolVisible.value = false;
};
onMounted(() => {
// socket = io('http://192.168.10.131:9025');
socket = io('http://123.132.248.154:9309');
destroyConnection();
createConnection(connectCallback);
setTimeout(() => {
@ -225,7 +262,6 @@
flyToFormVisible.value = true;
zIndex.value++;
};
const taskId = ref('');
const changeTakeOffForm = (val) => {
takeOffFormVisible.value = false;
if (val) {

4
src/views/demo/workmanagement/flightoperation/src/FlightControl.vue
Unescape Escape View File

@ -558,8 +558,8 @@
}
};
onMounted(() => {
socket = io('http://192.168.10.131:9025');
// socket = io('http://123.132.248.154:9309');
// socket = io('http://192.168.10.131:9025');
socket = io('http://123.132.248.154:9309');
// 添加键盘事件监听
document.addEventListener('keydown', handleKeyDown);
document.addEventListener('keyup', handleKeyUp);

193
src/views/demo/workmanagement/flightoperation/src/Patrol.vue
Unescape Escape View File

@ -1,93 +1,106 @@
<template>
<div>
<div class="shade-container" v-if="drawarea"></div>
<div class="airport-information">
<div class="title">选择AI算法实例<span> 航飞要求 </span></div>
<div class="content">
<div class="content-edit instantiate" @click="instantiateVisible = !instantiateVisible">
<div class="input-result">
<span :style="{ backgroundColor: instantiateItem.displayColor }">
{{ instantiateItem.displayScheme }}</span
>
{{ instantiateItem.name }}
<VueDragResize
:w="width"
:h="height"
:x="left"
:y="top"
:z="zIndex"
:isActive="true"
:parentLimitation="true"
:isResizable="false"
>
<div>
<div class="shade-container" v-if="drawarea"></div>
<div class="airport-information">
<div class="title">选择AI算法实例 <span> 航飞要求 </span></div>
<div class="content">
<div class="content-edit instantiate" @click="instantiateVisible = !instantiateVisible">
<div class="input-result">
<span :style="{ backgroundColor: instantiateItem.displayColor }">
{{ instantiateItem.displayScheme }}</span
>
{{ instantiateItem.name }}
</div>
<UpOutlined v-if="instantiateVisible" />
<DownOutlined v-else />
<div class="select-result" v-if="instantiateVisible">
<div
v-for="(item, index) in instantiateOptions"
:key="index"
@click="instantiateSelect(item)"
>
<span :style="{ backgroundColor: item.displayColor }">{{
item.displayScheme
}}</span>
{{ item.name }}
</div>
</div>
</div>
<UpOutlined v-if="instantiateVisible" />
<DownOutlined v-else />
<div class="select-result" v-if="instantiateVisible">
<div
v-for="(item, index) in instantiateOptions"
:key="index"
@click="instantiateSelect(item)"
>
<span :style="{ backgroundColor: item.displayColor }">{{ item.displayScheme }}</span>
{{ item.name }}
<div class="content-edit space">
<span>空间约束范围</span>
<div class="space-content">
<span>导入KML</span>
<span @click="drawarea = true"><PlusOutlined />新增</span>
</div>
</div>
</div>
<div class="content-edit space">
<span>空间约束范围</span>
<div class="space-content">
<span>导入KML</span>
<span @click="drawarea = true"><PlusOutlined />新增</span>
<div class="content-title">
<span>识别时间范围</span>
</div>
<div class="content-edit">
<a-select v-model:value="data.time" :options="timeOptions" />
</div>
<div class="content-title">
<span>触发动作</span>
</div>
<div class="content-edit" style="border: none">
<a-radio-group v-model:value="data.action" button-style="solid">
<a-radio-button value="1">关闭</a-radio-button>
<a-radio-button value="2">等待接管</a-radio-button>
</a-radio-group>
</div>
<div class="content-title">
<span>警告提示标题</span>
</div>
<div class="content-edit">
<a-input v-model:value="data.code" placeholder="异常提示" />
</div>
<div class="content-title">
<span>警告提示内容</span>
</div>
<div class="content-edit">
<a-textarea v-model:value="data.desc" placeholder="识别到异常目标" />
</div>
<div class="content-button">
<a-button type="primary" style="background: #3a57e8" @click="emits('changePatrol')"
>取消</a-button
>
<a-button type="primary" style="background: #0a99eb; margin-left: 20px" @click="submit"
>确定</a-button
>
</div>
</div>
<div class="content-title">
<span>识别时间范围</span>
</div>
<div class="content-edit">
<a-select v-model:value="data.time" :options="timeOptions" />
</div>
<div class="content-title">
<span>触发动作</span>
</div>
<div class="content-edit" style="border: none">
<a-radio-group v-model:value="data.action" button-style="solid">
<a-radio-button value="1">关闭</a-radio-button>
<a-radio-button value="2">等待接管</a-radio-button>
</a-radio-group>
</div>
<div class="content-title">
<span>警告提示标题</span>
</div>
<div class="content-edit">
<a-input v-model:value="data.code" placeholder="异常提示" />
</div>
<div class="content-title">
<span>警告提示内容</span>
</div>
<div class="content-edit">
<a-textarea v-model:value="data.desc" placeholder="识别到异常目标" />
</div>
<div class="patrol-map" v-if="drawarea">
<div class="title">绘制范围</div>
<div class="map-container">
<div class="map-container-content">
<Map :drawArea="drawarea" @areaData="getAreaData" />
</div>
</div>
<div class="content-button">
<a-button type="primary" style="background: #3a57e8" @click="emits('changePatrol')"
<a-button type="primary" style="background: #3a57e8" @click="drawarea = false"
>取消</a-button
>
<a-button type="primary" style="background: #0a99eb; margin-left: 20px" @click="submit"
<a-button
type="primary"
style="background: #0a99eb; margin-left: 20px"
@click="patrolMapConfirm"
>确定</a-button
>
</div>
</div>
</div>
<div class="patrol-map" v-if="drawarea">
<div class="title">绘制范围</div>
<div class="map-container">
<div class="map-container-content">
<Map :drawArea="drawarea" @areaData="getAreaData" />
</div>
</div>
<div class="content-button">
<a-button type="primary" style="background: #3a57e8" @click="drawarea = false"
>取消</a-button
>
<a-button
type="primary"
style="background: #0a99eb; margin-left: 20px"
@click="patrolMapConfirm"
>确定</a-button
>
</div>
</div>
</div>
</VueDragResize>
</template>
<script setup lang="ts">
import { reactive, ref, watch, onMounted } from 'vue';
@ -103,6 +116,7 @@
import { airPortStore } from '@/store/modules/airport';
import { callAiModel } from '@/api/workmanagement/droneDock';
import { EventBus } from '@/utils/eventBus';
import VueDragResize from 'vue-drag-resize/src';
const airPortStoreVal = airPortStore();
@ -111,7 +125,14 @@
const props = defineProps({
taskId: String,
type: String,
zIndex: Number,
});
const pageWidth = document.documentElement.clientWidth;
const width = ref(300);
const height = ref(550);
const left = ref(pageWidth - 620);
const top = ref(100);
const zIndex = ref(props.zIndex);
const data = reactive({
instantiate: null,
code: '',
@ -177,14 +198,14 @@
createMessage.warning('请选择AI算法实例');
return;
}
if (!data.code) {
createMessage.warning('警告提示标题不能为空');
return;
}
if (!data.desc) {
createMessage.warning('警告提示内容不能为空');
return;
}
// if (!data.code) {
// createMessage.warning('警告提示标题不能为空');
// return;
// }
// if (!data.desc) {
// createMessage.warning('警告提示内容不能为空');
// return;
// }
if (props.type == 'plan') {
const querys = {
algoInstanceId: instantiateItem.value.id,
@ -206,7 +227,7 @@
console.log(res);
createMessage.success('操作成功');
airPortStoreVal.setTaskId(props.taskId);
emits('changePatrol');
emits('changePatrol', true);
});
};
onMounted(() => {
@ -248,8 +269,8 @@
}
.airport-information {
position: absolute;
top: 100px;
right: 140px;
top: 0;
right: 5px;
width: 290px;
padding: 10px;
background: #0d0e15;

4
src/views/demo/workmanagement/inspection/index.vue
Unescape Escape View File

@ -54,8 +54,8 @@
function connectWebSocket() {
console.log('connectWebSocket');
// 初始化Socket连接
socket = io('http://192.168.10.131:9025');
// socket = io('http://123.132.248.154:9309');
// socket = io('http://192.168.10.131:9025');
socket = io('http://123.132.248.154:9309');
// 连接事件
socket.on('connect', () => {

Write Preview
Loading…
Cancel
Save