Skip to content

M
mmc-stl-vue2
提交 adbc5926 作者: 梁启东
操作

Merge branch 'v4' of http://git.mmcuav.cn/root/mmc-stl-vue2 into v4 

# Conflicts:
#	src/components/MMCFlightControlCenter/components/hangar/components/list/components/item/index.vue
上级 4b52de0b 27917c45
正在显示 包含 987 行增加 和 194 行删除
iframe/src/App.vue
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
@airwayListGet="dispatchEvent('airwayListGet', $event)" @airwayListGet="dispatchEvent('airwayListGet', $event)"
@airwayGet="dispatchEvent('airwayGet', $event)" @airwayGet="dispatchEvent('airwayGet', $event)"
@taskListGet="dispatchEvent('taskListGet', $event)" @taskListGet="dispatchEvent('taskListGet', $event)"
@leapFrogFlighGet="dispatchEvent('leapFrogFlighGet', $event)"
@apronUavSkipEvent="dispatchEvent('apronUavSkipEvent', $event)"
@taskRecordPageGet="dispatchEvent('taskRecordPageGet', $event)" @taskRecordPageGet="dispatchEvent('taskRecordPageGet', $event)"
@taskInfoUpdateTime="dispatchEvent('taskInfoUpdateTime', $event)" @taskInfoUpdateTime="dispatchEvent('taskInfoUpdateTime', $event)"
@taskInfoRecordDel="dispatchEvent('taskInfoRecordDel', $event)" @taskInfoRecordDel="dispatchEvent('taskInfoRecordDel', $event)"
......
src/components/MMCFlightControlCenter/api/modules/ai.js
import axios from "axios"; import axios from "axios";
import request from "../request";
// const gddaiapi = 'https://hawk.mmcuav.cn/gddaiapi';
export default class AI_API { export default class AI_API {
// 获取当前的ai配置
static getAiconfig(data) {
return request({
url: `/admin-api/system/ai-config/getconfig`,
method: "post",
data,
});
}
// 人脸 // 人脸
static face(data){ static face(data) {
// return axios.post("http://api.user.mmcuav.cn/aidemo/facedetect", data); // 百度的ai return axios.post(
return axios.post("https://hawk.mmcuav.cn/faceaiapi/detect/imageface", data); "https://hawk.mmcuav.cn/faceaiapi/detect/imageface",
data
);
} }
// 车牌 // 车牌
static plate(data) { static plate(data) {
return axios.post("https://hawk.mmcuav.cn/gddaiapi/api/inflet/v1/tasks/e01d1d01-52e2-4883-a5de-0ae268764db0/predict", data); // 共达地 return axios.post(
// return axios.post("https://hawk.mmcuav.cn/plateaiapi/detect/image", data); // 自研 "/gddaiapi/api/inflet/v1/tasks/e01d1d01-52e2-4883-a5de-0ae268764db0/predict",
data
); // 共达地
} }
// 人流 // 人流
static crowd(data){ static crowd(data) {
return axios.post("https://hawk.mmcuav.cn/gddaiapi/api/inflet/v1/tasks/18493235-4dd0-4f54-ab55-c1856ca7e3a5/predict", data); return axios.post(
"/gddaiapi/api/inflet/v1/tasks/18493235-4dd0-4f54-ab55-c1856ca7e3a5/predict",
data
);
} }
// 烟雾 // 烟雾
static smoke(data){ static smoke(data) {
return axios.post("https://hawk.mmcuav.cn/gddaiapi/api/inflet/v1/tasks/fca2eb65-8b99-4109-9f9e-a9f7fd06ac1f/predict", data); return axios.post(
"/gddaiapi/api/inflet/v1/tasks/fca2eb65-8b99-4109-9f9e-a9f7fd06ac1f/predict",
data
);
} }
// 漏油识别 // 漏油识别
static oilLeak(data){ static oilLeak(data) {
return axios.post("https://hawk.mmcuav.cn/oilaiapi/detect/image", data); return axios.post("https://hawk.mmcuav.cn/oilaiapi/detect/image", data);
} }
// 裸土识别 // 裸土识别
static bareSoil(data){ static bareSoil(data) {
return axios.post("https://hawk.mmcuav.cn/gddaiapi/api/inflet/v1/tasks/05a9d657-8339-4575-bced-04b60b74c690/predict", data); return axios.post(
"/gddaiapi/api/inflet/v1/tasks/05a9d657-8339-4575-bced-04b60b74c690/predict",
data
);
}
// 其余ai
static kbtAi(data) {
return axios.post("https://hawk.mmcuav.cn/detect/image", data);
} }
} }
src/components/MMCFlightControlCenter/api/request.js
...@@ -29,6 +29,7 @@ $axios.interceptors.request.use( ...@@ -29,6 +29,7 @@ $axios.interceptors.request.use(
config.headers["Tenant-Id"] = TenantId; config.headers["Tenant-Id"] = TenantId;
config.headers["terminal"] = 2; // 1 为管理后台 2 为前端项目 config.headers["terminal"] = 2; // 1 为管理后台 2 为前端项目
config.headers["p-id"] = projectId; config.headers["p-id"] = projectId;
console.log(config, store.state, "token信息验证");
return config; return config;
}, },
(error) => { (error) => {
...@@ -73,11 +74,14 @@ $axios.interceptors.response.use( ...@@ -73,11 +74,14 @@ $axios.interceptors.response.use(
isRefreshToken = false; isRefreshToken = false;
if (data.code === 0) { if (data.code === 0) {
const token = data.token; const token = data.token;
console.log('store', store);
window.$mmc_stl.app.$store.commit('MMCFlightControlCenter/setState', { window.$mmc_stl.app.$store.commit(
key: 'token', "MMCFlightControlCenter/setState",
value: token {
}) key: "token",
value: token,
}
);
config.headers.Authorization = "Bearer " + token; config.headers.Authorization = "Bearer " + token;
requestList.forEach((cb) => { requestList.forEach((cb) => {
cb(); cb();
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/airwayList/components/leapFrogFligh/components/leapFrogDialog/index.vue 0 → 100644
<template>
<el-dialog :visible.sync="localVisible" :close-on-click-modal="false" :modal-append-to-body="false"
:show-close="showClose" @close="handleClose" :width="width">
<div slot="title" class="dialog-header">
<div >
<img src="../../../../../../assets/images/mount_head.png" />
<span class="title vas">{{ title }}</span>
</div>
</div>
<div class="stl-timed-task">
<div class="timed-task-header">
<div class="header__column flex2">序号</div>
<div class="header__column flex2">机库名称</div>
<div class="header__column status">状态</div>
<div class="header__column flex2">距离(km)</div>
</div>
<div class="timed-task-main" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.8)">
<div class="row" :class="{ single: i % 2 != 0 }" v-for="(item, i) in taskListAll" :key="item.id">
<div class="row__column flex2">
<span class="f12">
<span class="mr10">
<el-checkbox v-model="item.active" :label="item.id"
:disabled="item.type === '忙碌'"></el-checkbox>
</span>{{ i + 1 }}
</span>
</div>
<div class="row__column flex2">
<el-tooltip class="item" effect="dark" :content="item.name" placement="top-start">
<span class="f12">{{ item.name }}</span>
</el-tooltip>
</div>
<div class="row__column flex2">
<el-tooltip class="item" effect="dark" :content="item.descText" placement="top-start">
<span class="f12"
:class="{ 'text-red': item.type === '忙碌', 'text-green': item.type == '空闲' }">{{
item.type
}}</span>
</el-tooltip>
</div>
<div class="row__column status" style="color: rgb(255, 189, 54)">
<el-tooltip class="item" effect="dark" :content="String(item.distance)" placement="top-start">
<span class="f12">{{ item.distance }}</span>
</el-tooltip>
</div>
</div>
</div>
<div class="task-add-btn">
<div class="task-add__btn">生成航线</div>
<div class="task-add__btn">一键任务</div>
</div>
</div>
</el-dialog>
</template>
<script>
export default {
name: 'leapFrogDialog',
props: {
title: {
type: String,
default: ''
},
showClose: {
type: Boolean,
default: true
},
visible: {
type: Boolean,
default: false
},
width: {
type: String,
default: '30%'
}
},
data() {
return {
loading: false,
taskListAll: [{
active: true,
name: "机库1",
type: "空闲",
distance: 10
},
{
active: true,
name: "机库2",
type: "忙碌",
distance: 12
}],
localVisible: this.visible // 根据 prop 初始化本地状态
};
},
watch: {
visible(newVal) {
this.localVisible = newVal; // 监听 prop 的变化
}
},
methods: {
handleClose() {
this.localVisible = false;
this.$emit('update:visible', false); // 通知父组件
},
confirm() {
this.$emit('confirm');
this.handleClose();
}
}
}
</script>
<style scoped lang="scss">
::v-deep {
.el-dialog__header {
padding: 5px;
}
.el-dialog__headerbtn {
top: 12px;
}
.el-dialog__footer {
text-align: center;
}
}
.dialog-header {
.title {
font-size: 20px;
font-family: YouSheBiaoTiHei;
color: #14faff;
line-height: 26px;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient(135deg, #e3aa77 0%, #f5cda9 38%, #f9ecd3 58%, #fcdbb1 79%, #edb07a 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
.dialog-footer {
.btn {
color: #fff;
background-color: #222222;
}
}
.stl-timed-task {
height: 230px;
display: flex;
flex-direction: column;
padding: 16px 4px;
gap: 0px;
box-sizing: border-box;
position: relative;
&::before {
position: absolute;
content: "";
width: calc(100% - 5px);
height: calc(100% - 24px);
border-radius: 4px;
border: 1px solid #4b4b4b;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
}
.timed-task-header {
display: flex;
flex-shrink: 0;
font-size: 14px;
height: 42px;
background: #343434;
font-family: YouSheBiaoTiHei;
font-size: 16px;
color: #ebf9ff;
.header__column {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
&.flex2 {
flex: 2;
}
&.status {
flex: initial;
width: 70px;
}
}
}
.timed-task-main {
color: #fff;
overflow-y: auto;
flex: 1;
z-index: 1;
.row {
display: flex;
color: #fff;
min-height: 52px;
background-color: #222222;
align-items: center;
gap: 3px;
&.single {
background-color: #343434;
}
.row__column {
font-size: 14px;
flex: 1;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.text-red {
color: red
}
.text-green {
color: green;
}
&.col-2 {
text-overflow: initial;
font-size: 14px;
}
&.flex2 {
flex: 2;
}
&.ctrl {
display: flex;
justify-content: center;
align-items: center;
gap: 5px;
i {
cursor: pointer;
font-size: 20px;
&.loading {
opacity: 0.5;
}
}
}
&.status {
flex: initial;
width: 70px;
font-size: 14px;
}
}
}
}
.task-add-btn {
display: flex;
z-index: 1;
.task-add__btn {
cursor: pointer;
width: 100px;
height: 28px;
background: #3388ff;
border-radius: 2px;
text-align: center;
line-height: 28px;
margin: 0 auto;
margin-bottom: 10px;
color: #fff;
}
}
}
</style>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/airwayList/components/leapFrogFligh/components/leapFrogFlighDialog/index.vue 0 → 100644
<template>
<el-dialog :modal='modal' :visible.sync="localVisible" :close-on-click-modal="false" :modal-append-to-body="false" :show-close="showClose" @close="handleClose"
:width="width">
<div slot="title" class="dialog-header">
<div v-if="dialogType == 1">
<img src="../../../../../../assets/images/mount_head.png" />
<span class="title vas">{{ title }}</span>
</div>
<span v-else class="dialog-header">
<div class="cf tc vas">{{ title }}</div>
</span>
</div>
<div>
<slot></slot>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="btn" @click="handleClose">取消</el-button>
<el-button type="primary" @click="confirm">确定</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
name: 'LeapFrogFlighDialog',
props: {
modal: {
type: Boolean,
default: true
},
title: {
type: String,
default: ''
},
dialogType: {
type: Number,
default: 1
},
showClose: {
type: Boolean,
default: true
},
visible: {
type: Boolean,
default: false
},
width: {
type: String,
default: '30%'
}
},
data() {
return {
localVisible: this.visible // 根据 prop 初始化本地状态
};
},
watch: {
visible(newVal) {
this.localVisible = newVal; // 监听 prop 的变化
}
},
methods: {
handleClose() {
this.localVisible = false;
this.$emit('update:visible', false); // 通知父组件
},
confirm() {
this.$emit('confirm');
this.handleClose();
}
}
}
</script>
<style scoped lang="scss">
::v-deep {
.el-dialog__header {
padding: 5px;
}
.el-dialog__headerbtn {
top: 12px;
}
.el-dialog__footer{
text-align: center;
}
}
.dialog-header {
.title {
font-size: 20px;
font-family: YouSheBiaoTiHei;
color: #14faff;
line-height: 26px;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient(135deg, #e3aa77 0%, #f5cda9 38%, #f9ecd3 58%, #fcdbb1 79%, #edb07a 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
.dialog-footer {
.btn {
color: #fff;
background-color: #222222;
}
}
</style>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/airwayList/components/normalTask/index.vue
...@@ -172,7 +172,6 @@ export default { ...@@ -172,7 +172,6 @@ export default {
*/ */
getTaskList(id) { getTaskList(id) {
return new Promise((resolve) => { return new Promise((resolve) => {
console.log("getTaskList", this.taskListAll);
this.rootNode.$emit("taskListGet", { this.rootNode.$emit("taskListGet", {
pageNo: 1, pageNo: 1,
pageSize: 100, pageSize: 100,
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/airwayList/index.vue
...@@ -3,25 +3,46 @@ ...@@ -3,25 +3,46 @@
<div class="task-list-header"> <div class="task-list-header">
<div <div
class="task-list-header__item" class="task-list-header__item"
:class="{active: tabIndex === 0 && useTimedTask}" :class="{ active: tabIndex === 0 && useTimedTask }"
@click="tabIndex = 0" @click="tabIndex = 0"
> >
<label>常态飞行</label> <label>常态飞行</label>
</div> </div>
<template v-if="useTimedTask"> <template v-if="useTimedTask">
<div class="task-list-header__item" :class="{active: tabIndex === 1}" @click="tabIndex = 1"> <div
class="task-list-header__item"
:class="{ active: tabIndex === 1 }"
@click="tabIndex = 1"
>
<label>定时飞行</label> <label>定时飞行</label>
</div> </div>
<div class="task-list-header__item" :class="{active: tabIndex === 2}" @click="tabIndex = 2"> <div
class="task-list-header__item"
:class="{ active: tabIndex === 2 }"
@click="tabIndex = 2"
>
<label>周期飞行</label> <label>周期飞行</label>
</div> </div>
<div
v-if="isLeapFrogFligh"
class="task-list-header__item"
:class="{ active: tabIndex === 3 }"
@click="tabIndex = 3"
>
<label>蛙跳飞行</label>
</div>
</template> </template>
</div> </div>
<div class="task-list-main"> <div class="task-list-main">
<!-- 常态任务 --> <!-- 常态任务 -->
<NormalTask v-if="tabIndex === 0"></NormalTask> <NormalTask v-if="tabIndex === 0"></NormalTask>
<!-- 定时任务 --><!-- 周期任务 --> <!-- 定时任务 --><!-- 周期任务 -->
<TimedTask v-else :type="tabIndex"></TimedTask> <TimedTask
v-else-if="tabIndex === 1 || tabIndex === 2"
:type="tabIndex"
></TimedTask>
<!-- 蛙跳飞行 -->
<leapFrogFligh v-else></leapFrogFligh>
</div> </div>
</div> </div>
</template> </template>
...@@ -29,6 +50,8 @@ ...@@ -29,6 +50,8 @@
<script> <script>
import NormalTask from "./components/normalTask"; import NormalTask from "./components/normalTask";
import TimedTask from "./components/timedTask"; import TimedTask from "./components/timedTask";
import leapFrogFligh from "./components/leapFrogFligh";
import { mapState } from "vuex"; import { mapState } from "vuex";
export default { export default {
...@@ -36,10 +59,12 @@ export default { ...@@ -36,10 +59,12 @@ export default {
components: { components: {
NormalTask, NormalTask,
TimedTask, TimedTask,
leapFrogFligh,
}, },
data() { data() {
return { return {
tabIndex: 0, tabIndex: 0,
isLeapFrogFligh: false,
}; };
}, },
computed: { computed: {
...@@ -52,8 +77,36 @@ export default { ...@@ -52,8 +77,36 @@ export default {
} }
}, },
}, },
created() {
let tmjData = JSON.parse(localStorage.getItem("tmj"));
if (tmjData) {
const userList = this.handleGetMenuList(tmjData.user.menuList);
// 获取蛙跳权限
let leapFrogFlighFlag = userList.find((item) => item.id == 3096);
if (leapFrogFlighFlag) {
this.isLeapFrogFligh = true;
}
}
},
mounted() {}, mounted() {},
methods: {}, methods: {
handleGetMenuList(menuList) {
const collector = [];
const flattenMenu = (items) => {
items.forEach((item) => {
if (item.children && item.children.length > 0) {
flattenMenu(item.children);
} else {
collector.push(item);
}
});
};
flattenMenu(menuList);
return collector;
},
},
}; };
</script> </script>
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/index.vue
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<!-- 展示视频 --> <!-- 展示视频 -->
<div class="left-video" :class="{collapse: playerCollapse}" v-if="hangar && showPanel && listCollapse"> <div class="left-video" :class="{collapse: playerCollapse}" v-if="hangar && showPanel && listCollapse">
<div class="collapse-btn" @click="playerCollapse = !playerCollapse"> <div class="collapse-btn" @click="playerCollapse = !playerCollapse">
<img src="./assets/images/collapse.svg" /> <img style="width:23px" src="./assets/images/collapse.svg" />
</div> </div>
<div class="left-video-header"> <div class="left-video-header">
<div class="left-video-header__title" @click="openList">机库列表</div> <!-- @click="openList" -->
<div class="left-video-header__title" >视频列表</div>
<div class="nest-name"> <div class="nest-name">
<span class="nest-name__text">{{ hangar.name }}</span> <span class="nest-name__text">{{ hangar.name }}</span>
<span class="nest-name__text">{{ hangar.name }}</span> <span class="nest-name__text">{{ hangar.name }}</span>
...@@ -189,7 +190,7 @@ export default { ...@@ -189,7 +190,7 @@ export default {
.collapse-btn { .collapse-btn {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
right: -35px; right: -22px;
top: 50%; top: 50%;
transform: translate(0, -50%); transform: translate(0, -50%);
z-index: 99; z-index: 99;
......
src/components/MMCFlightControlCenter/components/hangar/components/list/index.vue
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
<div <div
class="hangar-list_btn" class="hangar-list_btn"
@click="listCollapse = !listCollapse;" @click="listCollapse = !listCollapse;"
v-if="!hangar || (hangar && !listCollapse)"
> >
<!-- v-if="!hangar || (hangar && !listCollapse)" -->
<img style src="./assets/images/collapse.svg" /> <img style src="./assets/images/collapse.svg" />
</div> </div>
</div> </div>
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
right: -35px; right: -35px;
top: 50%; top: 23%;
transform: translate(0, -50%); transform: translate(0, -50%);
z-index: 99; z-index: 99;
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="control-bottom"> <div class="control-bottom">
<div class="control-bottom-item" @click="onStartTask"> <div class="control-bottom-item" @click="onStartTask">
<img src="./assets/images/start.svg" /> <img src="./assets/images/start.svg" />
<span class="dib">一键任务</span> <span class="dib">一键任务 </span>
</div> </div>
<div class="control-bottom-item" @click="onReturnFlight"> <div class="control-bottom-item" @click="onReturnFlight">
<img src="./assets/images/return.svg" /> <img src="./assets/images/return.svg" />
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/airwayList/components/airwayEdit/index.vue
...@@ -25,6 +25,12 @@ ...@@ -25,6 +25,12 @@
emitPath: false, emitPath: false,
}" @change="changeNode"></el-cascader> }" @change="changeNode"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="终点降落：" required>
<el-radio-group v-model="finishedAction">
<el-radio label="USING_INITIAL_DIRECTION">是</el-radio>
<el-radio label="GO_HOME">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="航线速度" prop="speed"> <el-form-item label="航线速度" prop="speed">
<el-input clearable v-model="curForm.speed"></el-input> <el-input clearable v-model="curForm.speed"></el-input>
</el-form-item> </el-form-item>
...@@ -135,6 +141,7 @@ export default { ...@@ -135,6 +141,7 @@ export default {
return { return {
orgList: [], orgList: [],
name: "", //航线名 name: "", //航线名
finishedAction: 'GO_HOME',//终点降落
departmentId:'',//部门id departmentId:'',//部门id
flightLabel:"",//航线标签 flightLabel:"",//航线标签
form: [], //表单集合 form: [], //表单集合
...@@ -360,7 +367,8 @@ export default { ...@@ -360,7 +367,8 @@ export default {
departmentId: this.departmentId, //部门id departmentId: this.departmentId, //部门id
name: this.name, name: this.name,
speed: this.form[0].speed, speed: this.form[0].speed,
flyTime: this.convertToSeconds(this.time) flyTime: this.convertToSeconds(this.time),
finishedAction: this.finishedAction,
}; };
try { try {
let res = await AirLine.add({ let res = await AirLine.add({
...@@ -370,6 +378,7 @@ export default { ...@@ -370,6 +378,7 @@ export default {
departmentId: airway.departmentId, departmentId: airway.departmentId,
sourceType: 1, sourceType: 1,
flyTime:airway.flyTime, flyTime:airway.flyTime,
finishedAction: airway.finishedAction,
linePointSaveReqVOS: airway.content.map((point) => ({ linePointSaveReqVOS: airway.content.map((point) => ({
latitude: point.coordinate.latitude, latitude: point.coordinate.latitude,
longitude: point.coordinate.longitude, longitude: point.coordinate.longitude,
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/airwayList/index.vue
...@@ -72,7 +72,7 @@ export default { ...@@ -72,7 +72,7 @@ export default {
"useSTLAirway", "useSTLAirway",
"useTask", "useTask",
]), ]),
...mapState("MMCFlightControlCenter/uav", ["uav","uavRealTimeData"]), ...mapState("MMCFlightControlCenter/uav", ["uav", "uavRealTimeData"]),
// 选择的任务 // 选择的任务
selectedTask() { selectedTask() {
let find = this.taskList.find((item) => { let find = this.taskList.find((item) => {
...@@ -176,7 +176,7 @@ export default { ...@@ -176,7 +176,7 @@ export default {
this.bus.$on("refreshAirway", this.getAirwayList); this.bus.$on("refreshAirway", this.getAirwayList);
await this.getTaskList(); await this.getTaskList();
await this.getAirwayList(); await this.getAirwayList();
console.log(this.uavRealTimeData,'this.uavRealTimeData'); console.log(this.uavRealTimeData, "this.uavRealTimeData");
// 获取正在飞行的航线 // 获取正在飞行的航线
if (this.uavRealTimeData.isFlying) { if (this.uavRealTimeData.isFlying) {
this.getTaskInfoRecord(); this.getTaskInfoRecord();
...@@ -240,7 +240,19 @@ export default { ...@@ -240,7 +240,19 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 100, pageSize: 100,
callback: (res) => { callback: (res) => {
this.airwayList = res?.records || []; this.airwayList = res?.records || [
/* {
id: item.id,
name: item.flightName,
organizationName: "无",
status: "可用", //空域状态
safe: item.safe ? 1 : 0, // 安全状态1: 安全 , 0: 待确定,
labelName: "无",
//航线数据
content,
finishedAction: "GO_HOME"
} */
];
this.$nextTick(() => { this.$nextTick(() => {
if (id) { if (id) {
this.selectedAirwayId = id; this.selectedAirwayId = id;
...@@ -266,10 +278,15 @@ export default { ...@@ -266,10 +278,15 @@ export default {
this.$message.warning("请选择航线"); this.$message.warning("请选择航线");
return; return;
} }
let diversionPoint = this.uav.diversionPoint;
if (!diversionPoint) {
return this.$message.warning("设备暂无备降点无法进行一键任务，请前往后台管理设置备降点！");
}
let data = this.taskList.filter((item) => item.id == this.selectedTaskId); let data = this.taskList.filter((item) => item.id == this.selectedTaskId);
if (data && data[0].status == "执行中") { if (data && data[0].status == "执行中") {
return this.$message.warning("当前任务执行中"); return this.$message.warning("当前任务执行中");
} }
try { try {
await this.$confirm("请确认是否进行一键任务操作?", "安全确认", { await this.$confirm("请确认是否进行一键任务操作?", "安全确认", {
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -277,6 +294,7 @@ export default { ...@@ -277,6 +294,7 @@ export default {
customClass: "uav_controlPane", customClass: "uav_controlPane",
showClose: false, showClose: false,
}); });
//
this.$store.commit("MMCFlightControlCenter/uav/setState", { this.$store.commit("MMCFlightControlCenter/uav/setState", {
key: "airlineData", key: "airlineData",
value: this.selectedAirway, value: this.selectedAirway,
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/viewLib/index.vue
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
> >
<el-option <el-option
v-for="item in aiTypeList" v-for="item in aiTypeList"
:key="item.id" :key="item.typeId"
:label="item.value" :label="item.title"
:value="item.id" :value="item.typeId"
></el-option> ></el-option>
</el-select> </el-select>
<el-checkbox <el-checkbox
...@@ -262,39 +262,118 @@ export default { ...@@ -262,39 +262,118 @@ export default {
isIndeterminate: false, isIndeterminate: false,
selectAll: false, //全选 selectAll: false, //全选
viewLibTab: 0, // 视图库tab索引, 0: 视图, 1: 机载 viewLibTab: 0, // 视图库tab索引, 0: 视图, 1: 机载
aiType: 0, // 图片类型 aiType: 1, // 图片类型
aiTypeList: [ aiTypeList: [
// 普通图片或ai图片选项
{ {
id: 0, typeId: 1,
value: "全部", title: "人车识别",
}, },
{ {
id: 1, typeId: 2,
value: "人脸识别", title: "烟火识别",
}, },
{ {
id: 8, typeId: 4,
// id: 2, title: "行人识别",
value: "车牌识别",
}, },
{ {
id: 3, typeId: 5,
value: "人流识别", title: "机动车识别",
}, },
{ {
id: 4, typeId: 6,
value: "烟雾识别", title: "两轮车识别",
}, },
{ {
id: 5, typeId: 7,
value: "漏油识别", title: "三轮车识别",
}, },
{ {
id: 6, typeId: 8,
value: "裸土识别", title: "挖掘机识别",
}, },
], //视图库类型 {
typeId: 9,
title: "车牌识别",
},
{
typeId: 10,
title: "人脸识别",
},
{
typeId: 11,
title: "口罩识别",
},
{
typeId: 14,
title: "烟雾识别",
},
{
typeId: 15,
title: "火焰识别",
},
{
typeId: 17,
title: "占道经营",
},
{
typeId: 22,
title: "船舶识别",
},
{
typeId: 23,
title: "漏油识别",
},
{
typeId: 24,
title: "头盔识别",
},
{
typeId: 25,
title: "管线识别",
},
{
typeId: 26,
title: "路面裂缝",
},
{
typeId: 27,
title: "顶棚违建",
},
{
typeId: 28,
title: "门牌广告",
},
{
typeId: 29,
title: "井盖识别",
},
{
typeId: 30,
title: "搅拌车识别",
},
{
typeId: 31,
title: "油罐车识别",
},
{
typeId: 32,
title: "渣土车识别",
},
{
typeId: 33,
title: "排气口识别",
},
{
typeId: 34,
title: "人流识别",
},
{
title: "裸土识别",
typeId: 35,
},
],
//视图库类型
fileType: "图片", //视图文件类型 0：图片；1：视频 fileType: "图片", //视图文件类型 0：图片；1：视频
photoList: [], //资源列表对应的对象 photoList: [], //资源列表对应的对象
photoListDate: null, //某日期的所有资源 photoListDate: null, //某日期的所有资源
......
src/components/MMCFlightControlCenter/components/uavApplications/components/uavList/index.vue
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
style="color: rgba(123, 181, 213, 1)" style="color: rgba(123, 181, 213, 1)"
></i> ></i>
</el-input> </el-input>
<el-button class="uav-search__btn" @click="onUavSearch" v-hover>搜索</el-button> <el-button class="uav-search__btn" @click="onUavSearch" v-hover
>搜索</el-button
>
</div> </div>
<List <List
class="uav-list-main" class="uav-list-main"
...@@ -135,7 +137,7 @@ export default { ...@@ -135,7 +137,7 @@ export default {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
right: -35px; right: -35px;
top: 50%; top: 23%;
transform: translate(0, -50%); transform: translate(0, -50%);
z-index: 99; z-index: 99;
......
src/components/MMCFlightControlCenter/index.vue
...@@ -257,6 +257,7 @@ export default { ...@@ -257,6 +257,7 @@ export default {
const content = JSON.parse(data.content || "{}"); const content = JSON.parse(data.content || "{}");
const msg = content.message; const msg = content.message;
switch (type) { switch (type) {
// 接管申请 // 接管申请
case "uas-device-take-message": case "uas-device-take-message":
//接管消息 //接管消息
...@@ -344,6 +345,9 @@ export default { ...@@ -344,6 +345,9 @@ export default {
const content = JSON.parse(data.content || "{}"); const content = JSON.parse(data.content || "{}");
const msg = content.message; const msg = content.message;
switch (type) { switch (type) {
case "uas-device-take-message":
console.log(msg,'msg');
break;
// 刷新无人机列表 // 刷新无人机列表
case "uas-device-getTree-message": case "uas-device-getTree-message":
this.bus.$emit("uas-device-getTree-message", { this.bus.$emit("uas-device-getTree-message", {
......
src/components/MMCFlightControlCenter/store/hangar.js
...@@ -101,6 +101,7 @@ const actions = { ...@@ -101,6 +101,7 @@ const actions = {
}); });
} }
} }
// console.log(msgList, "机库返回数据");
commit("setState", { commit("setState", {
key: "hangarRealTimeData", key: "hangarRealTimeData",
...@@ -295,7 +296,7 @@ const actions = { ...@@ -295,7 +296,7 @@ const actions = {
* @param {function} data.callback //完成回调 * @param {function} data.callback //完成回调
*/ */
async takeOff({ state }, data) { async takeOff({ state }, data) {
console.log(state.airlineData, data, '1111'); console.log(state.airlineData, data, "1111");
try { try {
// 生成架次号 // 生成架次号
const flightSortieId = await TaskInfo.flightSortieId({ const flightSortieId = await TaskInfo.flightSortieId({
...@@ -324,7 +325,7 @@ const actions = { ...@@ -324,7 +325,7 @@ const actions = {
maxFlightSpeed: 12, maxFlightSpeed: 12,
}, },
}, },
callback() { }, callback() {},
}); });
} catch (e) { } catch (e) {
console.log("一键起飞失败", e); console.log("一键起飞失败", e);
......
src/components/MMCFlightControlCenter/store/uav.js
...@@ -6,7 +6,7 @@ let positions = []; // 飞机走过的点, 会一直累计, 每n秒减半一次, ...@@ -6,7 +6,7 @@ let positions = []; // 飞机走过的点, 会一直累计, 每n秒减半一次,
setInterval(() => { setInterval(() => {
if (positions.length > 1000) { if (positions.length > 1000) {
positions = positions.filter((x, index) => index % 2 === 0); positions = positions.filter((x, index) => index % 2 === 0);
console.log('飞行轨迹', positions); console.log("飞行轨迹", positions);
} }
}, 60000); }, 60000);
if (!window.$mmc_stl) { if (!window.$mmc_stl) {
...@@ -14,7 +14,7 @@ if (!window.$mmc_stl) { ...@@ -14,7 +14,7 @@ if (!window.$mmc_stl) {
} }
window.$mmc_stl.positions = () => { window.$mmc_stl.positions = () => {
console.log(positions); console.log(positions);
} };
const defaultPos = { const defaultPos = {
latitude: 0, // 纬度 latitude: 0, // 纬度
longitude: 0, // 经度 longitude: 0, // 经度
...@@ -432,7 +432,7 @@ const actions = { ...@@ -432,7 +432,7 @@ const actions = {
if (item.mountId === type259.mountId) { if (item.mountId === type259.mountId) {
return { return {
...item, ...item,
...type259 ...type259,
}; };
} }
return item; return item;
...@@ -507,7 +507,11 @@ const actions = { ...@@ -507,7 +507,11 @@ const actions = {
} else { } else {
// const posData = UAVDataParser(state.uavRealTimeData); // 这种写法在执行rollup混淆压缩后, posData对象会变成elementUI的对象,原因未知 // const posData = UAVDataParser(state.uavRealTimeData); // 这种写法在执行rollup混淆压缩后, posData对象会变成elementUI的对象,原因未知
// 更新轨迹 // 更新轨迹
let flag = positions.some(val => val.x == UAVDataParser(state.uavRealTimeData).position.x && val.y == UAVDataParser(state.uavRealTimeData).position.y) let flag = positions.some(
(val) =>
val.x == UAVDataParser(state.uavRealTimeData).position.x &&
val.y == UAVDataParser(state.uavRealTimeData).position.y
);
if (!flag) { if (!flag) {
positions.push(UAVDataParser(state.uavRealTimeData).position); positions.push(UAVDataParser(state.uavRealTimeData).position);
} }
...@@ -700,7 +704,11 @@ const actions = { ...@@ -700,7 +704,11 @@ const actions = {
* @param {object} data.taskInfoId //任务id * @param {object} data.taskInfoId //任务id
*/ */
async takeOff({ state, commit }, data) { async takeOff({ state, commit }, data) {
console.log(state.airlineData, data); let diversionPoint = state.uav.diversionPoint;
let diversionPointArr = diversionPoint.split(",");
if (diversionPointArr.length < 2) {
return console.log("备降点错误");
}
if (state.uav.network == 2) { if (state.uav.network == 2) {
try { try {
let flightSortieId; let flightSortieId;
...@@ -709,7 +717,7 @@ const actions = { ...@@ -709,7 +717,7 @@ const actions = {
taskInfoId: data.taskInfoId || undefined, taskInfoId: data.taskInfoId || undefined,
deviceId: state.uav.deviceId, deviceId: state.uav.deviceId,
reouteId: state.airlineData.id, reouteId: state.airlineData.id,
}) });
} else { } else {
// 生成架次号 // 生成架次号
flightSortieId = await TaskInfo.flightSortieId({ flightSortieId = await TaskInfo.flightSortieId({
...@@ -721,82 +729,89 @@ const actions = { ...@@ -721,82 +729,89 @@ const actions = {
/* const flightSortieId = { /* const flightSortieId = {
data: `tmj-v4-${Date.now()}` data: `tmj-v4-${Date.now()}`
} */ } */
// 上传航线指令 // 一键任务
const waypointList = state.airlineData?.content; const waypointList = state.airlineData?.content;
window.$mmc_stl.$store.dispatch("MMCMQTT/publish", { window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
topic: "PX4/OBTAIN/" + state.uav.deviceId, topic: "PX4/OBTAIN/" + state.uav.deviceId,
data: { data: {
type: window.$mmc_stl.$store.state.MMCMQTT.orders.航线上传, type: window.$mmc_stl.$store.state.MMCMQTT.orders.一键任务,
data: { data: {
taskId: state.airlineData.id, taskId: state.airlineData.id,
flightSortiesID: flightSortieId.data, flightSortiesID: flightSortieId.data,
waypointList: waypointList, waypointList: waypointList,
autoFlightSpeed: state.airlineData.baseSpeed || 6, autoFlightSpeed: state.airlineData.baseSpeed || 6,
finishedAction: "GO_HOME", finishedAction: state.airlineData.finishedAction || "GO_HOME",
headingMode: "AUTO", headingMode: "AUTO",
isExitMissionOnRCSignalLostEnabled: true, isExitMissionOnRCSignalLostEnabled: true,
maxFlightSpeed: 12, maxFlightSpeed: 12,
rallyList: [
{
longitude: diversionPointArr[0],
altitude: diversionPointArr[2],
latitude: diversionPointArr[1],
}, },
}, ],
callback() { },
});
// 告诉飞控开始任务,并且把架次号和 任务id传过去
window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
topic: "PX4/OBTAIN/" + state.uav.deviceId,
data: {
type: window.$mmc_stl.$store.state.MMCMQTT.orders.绑定任务id,
data: {
taskId: state.airlineData.id,
flightSortiesID: flightSortieId.data,
}, },
}, },
callback() { }, callback() {},
}); });
// // 告诉飞控开始任务,并且把架次号和 任务id传过去
// window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
// topic: "PX4/OBTAIN/" + state.uav.deviceId,
// data: {
// type: window.$mmc_stl.$store.state.MMCMQTT.orders.绑定任务id,
// data: {
// taskId: state.airlineData.id,
// flightSortiesID: flightSortieId.data,
// },
// },
// callback() {},
// });
// 起飞指令 // 起飞指令
commit("setState", { // commit("setState", {
key: "waitAirlineUpload", // key: "waitAirlineUpload",
value: true, // value: true,
}); // });
let time = setInterval(() => { // let time = setInterval(() => {
if (state.uavRealTimeData.uploadAirline) { // if (state.uavRealTimeData.uploadAirline) {
clearInterval(time); // clearInterval(time);
window.$mmc_stl.$store.dispatch("MMCMQTT/publish", { // window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
topic: "PX4/OBTAIN/" + state.uav.deviceId, // topic: "PX4/OBTAIN/" + state.uav.deviceId,
data: { // data: {
type: window.$mmc_stl.$store.state.MMCMQTT.orders.航线一键起飞, // type: window.$mmc_stl.$store.state.MMCMQTT.orders.航线一键起飞,
data: { // data: {
taskId: state.airlineData.id, // taskId: state.airlineData.id,
seq: 0, // seq: 0,
}, // },
}, // },
callback() { // callback() {
data?.callback && data.callback(true, flightSortieId.data); // data?.callback && data.callback(true, flightSortieId.data);
}, // },
}); // });
// 清空261数据 // // 清空261数据
let dataSet = window.$mmc_stl.$store.state.MMCMQTT.dataSet; // let dataSet = window.$mmc_stl.$store.state.MMCMQTT.dataSet;
dataSet[state.uav.deviceId][261] = null; // dataSet[state.uav.deviceId][261] = null;
window.$mmc_stl.$store.commit("MMCMQTT/setSate", { // window.$mmc_stl.$store.commit("MMCMQTT/setSate", {
key: "dataSet", // key: "dataSet",
value: dataSet, // value: dataSet,
}); // });
commit("setState", { // commit("setState", {
key: "uavRealTimeData", // key: "uavRealTimeData",
value: { // value: {
...state.uavRealTimeData, // ...state.uavRealTimeData,
uploadAirline: null, // uploadAirline: null,
}, // },
}); // });
} // }
}, 1000); // }, 1000);
// 做个保险, 要是因为各种原因导致没飞起, 超过一分钟删除循环定时器 // // 做个保险, 要是因为各种原因导致没飞起, 超过一分钟删除循环定时器
setTimeout(() => { // setTimeout(() => {
clearInterval(time); // clearInterval(time);
}, 60000); // }, 60000);
} catch (e) { } catch (e) {
console.log("一键起飞失败", e); console.log("一键起飞失败", e);
data?.callback && data.callback(false); data?.callback && data.callback(false);
...@@ -1317,7 +1332,8 @@ const actions = { ...@@ -1317,7 +1332,8 @@ const actions = {
window.$mmc_stl.$store.dispatch("MMCMQTT/publish", { window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
topic: "PX4/OBTAIN/" + state.uav.deviceId, topic: "PX4/OBTAIN/" + state.uav.deviceId,
data: { data: {
type: window.$mmc_stl.$store.state.MMCMQTT.orders.云台控制指令can包透传, type: window.$mmc_stl.$store.state.MMCMQTT.orders
.云台控制指令can包透传,
data: { data: {
mountId: data.mountId, mountId: data.mountId,
payload: data.buffer, payload: data.buffer,
...@@ -1376,7 +1392,7 @@ const actions = { ...@@ -1376,7 +1392,7 @@ const actions = {
type: window.$mmc_stl.$store.state.MMCMQTT.orders.链路切换, type: window.$mmc_stl.$store.state.MMCMQTT.orders.链路切换,
data, data,
}, },
callback() { }, callback() {},
}); });
}, },
// 键盘控制 // 键盘控制
......
src/plugins/MMCMQTT/orders.js
...@@ -8,6 +8,7 @@ export default { ...@@ -8,6 +8,7 @@ export default {
摇杆控制: 519, 摇杆控制: 519,
航线下载: 520, 航线下载: 520,
航线上传: 521, 航线上传: 521,
一键任务: 529,
航线一键起飞: 522, 航线一键起飞: 522,
暂停航线任务: 523, 暂停航线任务: 523,
继续航线任务: 524, 继续航线任务: 524,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论