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

Merge branch 'main' of http://123.132.248.154:10000/gitY/DiKongGanZhiPingTai

main
刘妍 2025-06-25 16:54:52 +08:00
parent 030dd2cc9a 59baa453ae
commit 94fa1b4309
5 changed files with 73 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/demo/workmanagement/device/Airport/index.vue
View File

@ -207,6 +207,10 @@ const workStatus = (record) => {
}
const openDeviceControl = (record) => {
controlSN.value = record.sn
let check = Object.keys(deviceInfoList.value).includes(controlSN.value) && Object.keys(deviceInfoList.value[controlSN.value]).includes('mode_code')
if(!check){
return message.warning('未获取到机场信息')
}
deviceControl.value = true
}
const editDevice = (record) => {

12
src/views/demo/workmanagement/projecthome/Info/index.vue
View File

@ -15,8 +15,8 @@
<div class="info-title">无人值守机场</div>
<div class="info-interval"></div>
<div class="info-value">
<div class="info-value-span">157</div>
<div class="info-value-shadow">157</div>
<div class="info-value-span">1</div>
<div class="info-value-shadow">1</div>
</div>
</div>
</div>
@ -30,8 +30,8 @@
<div class="info-title">其他巡飞设备</div>
<div class="info-interval"></div>
<div class="info-value">
<div class="info-value-span">932</div>
<div class="info-value-shadow">932</div>
<div class="info-value-span">1</div>
<div class="info-value-shadow">1</div>
</div>
</div>
</div>
@ -45,8 +45,8 @@
<div class="info-title">飞行员</div>
<div class="info-interval"></div>
<div class="info-value">
<div class="info-value-span">132</div>
<div class="info-value-shadow">132</div>
<div class="info-value-span">1</div>
<div class="info-value-shadow">1</div>
</div>
</div>
</div>

14
src/views/demo/workmanagement/projecthome/ProjectList/AddProject/Record/index.vue
View File

@ -2,7 +2,12 @@
<div class="setting-item">
<div class="setting-label-div">
<div class="setting-label">机场自动录制</div>
<div class="hint"></div>
<a-tooltip placement="bottom">
<template #title>
<span>设备在任务开始时自动开启录制，任务结束时关闭录制。该功能会消耗较多直播时长及存储空间，请按需开启</span>
</template>
<div class="hint"></div>
</a-tooltip>
</div>
<div class="setting-value-div">
<a-switch class="setting-switch" v-model:checked="props.project.isAirportRecord" />
@ -12,7 +17,12 @@
<div class="setting-item">
<div class="setting-label-div">
<div class="setting-label"> 飞行器自动录制(遥控器接入) </div>
<div class="hint"></div>
<a-tooltip placement="bottom">
<template #title>
<span>设备在任务开始时自动开启录制，任务结束时关闭录制。该功能会消耗较多直播时长及存储空间，请按需开启</span>
</template>
<div class="hint"></div>
</a-tooltip>
</div>
<div class="setting-value-div">
<a-switch class="setting-switch" v-model:checked="props.project.isAircraftRecord" />

23
src/views/demo/workmanagement/projecthome/ProjectList/AddProject/Weather/index.vue
View File

@ -2,7 +2,18 @@
<div class="setting-item">
<div class="setting-label-div">
<div class="setting-label">云端天气阻飞</div>
<div class="hint"></div>
<a-tooltip placement="bottom">
<template #title>
<span>
开启后，您可依据实际工况自定义阻飞的天气值，当风速或雨量大于设置值时，云端将对机场的飞行器进行阻飞。<br/>
关闭后，设备将按照默认天气值阻飞，机场的阻飞条件：<br/>
大疆机场：风速 (风速计) ≥12m/s 或 雨量 (雨量计) ≥大雨<br/>
大疆机场 2：风速 (风速计) ≥8m/s 或 雨量 (雨量计) ≥大雨<br/>
大疆机场3：风速 (风速计) ≥12m/s 或 雨量 (雨量计) ≥大雨
</span>
</template>
<div class="hint"></div>
</a-tooltip>
</div>
<div class="setting-value-div">
<a-switch class="setting-switch" v-model:checked="props.project.isCloudBlockFlight" />
@ -12,7 +23,15 @@
<div class="setting-item">
<div class="setting-label-div">
<div class="setting-label">使用天气预报数据阻飞</div>
<div class="hint"></div>
<a-tooltip placement="bottom">
<template #title>
<span>
开启后，天气阻飞将使用天气预报，同时也会使用机场风速计和雨量计数据。<br/>
关闭后，天气阻飞不使用天气预报，仅使用机场风速计和雨量计数据。
</span>
</template>
<div class="hint"></div>
</a-tooltip>
</div>
<div class="setting-value-div">
<a-switch class="setting-switch" v-model:checked="props.project.isWeatherBlockFlight" />

40
src/views/demo/workmanagement/projecthome/ProjectList/AddProject/index.vue
View File

@ -23,7 +23,12 @@
<div style="display: flex;align-items: center;">
<div class="require-mark">*</div>
<div class="add-project-title-content">项目作业中心点</div>
<div class="hint"></div>
<a-tooltip placement="bottom">
<template #title>
<span>项目在地图上的地理位置</span>
</template>
<div class="hint"></div>
</a-tooltip>
</div>
<div class="location-div" @click="getLocationCenter">
<div class="location-icon"></div>
@ -35,10 +40,15 @@
<div class="setting-label-div">
<div class="setting-label">申请码加入项目</div>
</div>
<div v-if="props.modalType == 'insert'" class="setting-value-div setting-value-div-disable">
<div>{{project.isAllowRequestCode? "已开启": "未开启"}}</div>
<div class="arrow-icon"></div>
</div>
<a-tooltip placement="bottom" v-if="props.modalType == 'insert'">
<template #title>
<span>项目创建完成后才能修改该选项</span>
</template>
<div class="setting-value-div setting-value-div-disable">
<div>{{project.isAllowRequestCode? "已开启": "未开启"}}</div>
<div class="arrow-icon"></div>
</div>
</a-tooltip>
<div v-else class="setting-value-div" @click="openChildSetting('申请码加入项目')">
<div>{{project.isAllowRequestCode? "已开启": "未开启"}}</div>
<div class="arrow-icon"></div>
@ -56,7 +66,12 @@
<div class="setting-item">
<div class="setting-label-div">
<div class="setting-label">多机安全起降</div>
<div class="hint"></div>
<a-tooltip placement="bottom">
<template #title>
<span>开启后，会启用起降调度来管理部署距离较近的机场上飞机的起飞和降落</span>
</template>
<div class="hint"></div>
</a-tooltip>
</div>
<div class="setting-value-div">
<a-switch class="setting-switch" v-model:checked="project.isMultipleAircraft" />
@ -66,10 +81,15 @@
<div class="setting-label-div">
<div class="setting-label">录制设置</div>
</div>
<div v-if="props.modalType == 'insert'" class="setting-value-div setting-value-div-disable">
<div>{{(project.isAirportRecord || project.isAircraftRecord)? "已开启": "未开启"}}</div>
<div class="arrow-icon"></div>
</div>
<a-tooltip placement="bottom" v-if="props.modalType == 'insert'">
<template #title>
<span>项目创建完成后才能修改该选项</span>
</template>
<div class="setting-value-div setting-value-div-disable">
<div>{{(project.isAirportRecord || project.isAircraftRecord)? "已开启": "未开启"}}</div>
<div class="arrow-icon"></div>
</div>
</a-tooltip>
<div v-else class="setting-value-div" @click="openChildSetting('录制设置')">
<div>{{(project.isAirportRecord || project.isAircraftRecord)? "已开启": "未开启"}}</div>
<div class="arrow-icon"></div>