Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
M
mmc-stl-vue2
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Administrator
mmc-stl-vue2
Commits
2fc45db9
提交
2fc45db9
authored
4月 13, 2024
作者:
翁进城
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
style: 更改store的uavApplications名称为uav
上级
b245a574
隐藏空白字符变更
内嵌
并排
正在显示
18 个修改的文件
包含
41 行增加
和
41 行删除
+41
-41
index.vue
...htControlCenter/components/mount/MMC_Gimbal_GAS/index.vue
+1
-1
index.vue
...omponents/controlPanel/components/controlBottom/index.vue
+7
-7
index.vue
...anel/components/controlLeft/components/taskList/index.vue
+5
-5
index.vue
.../components/controlPanel/components/controlLeft/index.vue
+1
-1
index.vue
...lRight/components/controlList/components/logger/index.vue
+1
-1
index.vue
.../components/controlRight/components/controlList/index.vue
+3
-3
index.vue
.../controlRight/components/health/components/logs/index.vue
+1
-1
index.vue
...Panel/components/controlRight/components/health/index.vue
+1
-1
index.vue
...lPanel/components/controlRight/components/mount/index.vue
+4
-4
index.vue
...components/controlPanel/components/controlRight/index.vue
+1
-1
index.vue
...ponents/uavApplications/components/controlPanel/index.vue
+1
-1
index.vue
...lications/components/player/components/obstacle/index.vue
+1
-1
index.vue
...er/components/uavApplications/components/player/index.vue
+3
-3
index.vue
...ponents/uavList/components/list/components/item/index.vue
+2
-2
index.vue
...CFlightControlCenter/components/uavApplications/index.vue
+2
-2
linkFusion.js
...rolCenter/components/uavApplications/mixins/linkFusion.js
+4
-4
index.js
src/components/MMCFlightControlCenter/store/index.js
+2
-2
uav.js
src/components/MMCFlightControlCenter/store/uav.js
+1
-1
没有找到文件。
src/components/MMCFlightControlCenter/components/mount/MMC_Gimbal_GAS/index.vue
浏览文件 @
2fc45db9
...
...
@@ -272,7 +272,7 @@ export default {
},
computed
:
{
$uav
()
{
return
this
.
$store
.
state
.
uav
Applications
.
uav
;
return
this
.
$store
.
state
.
uav
.
uav
;
},
},
mounted
()
{
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/index.vue
浏览文件 @
2fc45db9
...
...
@@ -210,13 +210,13 @@ export default {
};
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
,
"airlineData"
,
]),
},
methods
:
{
...
mapActions
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapActions
(
"MMCFlightControlCenter/uav"
,
[
"isTakeOver"
,
]),
// 无人机接管更新状态
...
...
@@ -243,7 +243,7 @@ export default {
this
.
updateTakeOver
();
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/returnFlight"
,
"MMCFlightControlCenter/uav/returnFlight"
,
{
callback
:
(
isOk
)
=>
{
isOk
&&
this
.
$message
.
success
(
"发出返航指令成功"
);
...
...
@@ -267,7 +267,7 @@ export default {
}).
then
((
res
)
=>
{
this
.
updateTakeOver
();
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/takeEnd"
,
{
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav/takeEnd"
,
{
callback
:
(
isOk
)
=>
{
isOk
&&
this
.
$message
.
success
(
"发出任务结束指令成功"
);
},
...
...
@@ -284,7 +284,7 @@ export default {
return
;
}
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/modeManual"
,
"MMCFlightControlCenter/uav/modeManual"
,
{
callback
:
(
isOk
)
=>
{
isOk
&&
(
this
.
controlType
=
1
);
...
...
@@ -302,7 +302,7 @@ export default {
return
;
}
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/modeAuto"
,
"MMCFlightControlCenter/uav/modeAuto"
,
{
callback
:
(
isOk
)
=>
{
isOk
&&
(
this
.
controlType
=
0
);
...
...
@@ -320,7 +320,7 @@ export default {
return
;
}
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/modeKeyboard"
,
"MMCFlightControlCenter/uav/modeKeyboard"
,
{
callback
:
(
isOk
)
=>
{
isOk
&&
(
this
.
controlType
=
2
);
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/taskList/index.vue
浏览文件 @
2fc45db9
...
...
@@ -93,7 +93,7 @@ export default {
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter"
,
[
"taskList"
,
"cesiumViewer"
]),
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
"uav"
]),
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
]),
taskListAll
()
{
return
[{
name
:
"选择航线自动生成任务"
,
id
:
-
1
},
...
this
.
taskList
];
},
...
...
@@ -132,7 +132,7 @@ export default {
this
.
clearAirwayEntities
();
},
methods
:
{
...
mapActions
(
"MMCFlightControlCenter/uav
Applications
"
,
[
"isTakeOver"
]),
...
mapActions
(
"MMCFlightControlCenter/uav"
,
[
"isTakeOver"
]),
/**
* 更改航线事件
*/
...
...
@@ -163,7 +163,7 @@ export default {
});
if
(
this
.
selectedAirway
.
id
===
-
1
)
{
this
.
$store
.
commit
(
"MMCFlightControlCenter/uav
Applications
/setState"
,
"MMCFlightControlCenter/uav/setState"
,
{
key
:
"airlineData"
,
value
:
null
,
...
...
@@ -171,14 +171,14 @@ export default {
);
}
else
{
this
.
$store
.
commit
(
"MMCFlightControlCenter/uav
Applications
/setState"
,
"MMCFlightControlCenter/uav/setState"
,
{
key
:
"airlineData"
,
value
:
this
.
selectedAirway
,
}
);
}
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/takeOff"
);
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav/takeOff"
);
this
.
rootNode
.
$emit
(
"startTask"
,
this
.
uav
,
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/index.vue
浏览文件 @
2fc45db9
...
...
@@ -68,7 +68,7 @@ export default {
};
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
"uav"
]),
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
]),
// 收起列表按钮
listCollapse
:
{
get
()
{
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/controlList/components/logger/index.vue
浏览文件 @
2fc45db9
...
...
@@ -69,7 +69,7 @@ export default {
};
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
"uav"
]),
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
]),
},
watch
:
{
async
uav
(
newVal
)
{
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/controlList/index.vue
浏览文件 @
2fc45db9
...
...
@@ -145,7 +145,7 @@ export default {
};
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
,
"airlineEntity"
,
"userInfo"
,
...
...
@@ -163,7 +163,7 @@ export default {
if
(
!
this
.
YGPermissionsSend
)
{
this
.
YGPermissionsSend
=
true
;
// 发送抢权限指令
this
.
$store
.
dispatch
(
"
uavApplications
/changeYGPermissions"
,
{
this
.
$store
.
dispatch
(
"
MMCFlightControlCenter/uav
/changeYGPermissions"
,
{
callback
:
()
=>
{},
});
setTimeout
(()
=>
{
...
...
@@ -189,7 +189,7 @@ export default {
}
},
methods
:
{
...
mapActions
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapActions
(
"MMCFlightControlCenter/uav"
,
[
"continueFly"
,
"pauseFly"
,
"land"
,
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/health/components/logs/index.vue
浏览文件 @
2fc45db9
...
...
@@ -131,7 +131,7 @@ export default {
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
,
"airlineData"
,
]),
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/health/index.vue
浏览文件 @
2fc45db9
...
...
@@ -385,7 +385,7 @@ export default {
props
:
{},
components
:
{
Logs
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
,
"airlineData"
,
"uavRealTimeData"
,
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/mount/index.vue
浏览文件 @
2fc45db9
...
...
@@ -56,7 +56,7 @@ export default {
return
{};
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
,
"mountList"
,
"airlineId"
,
...
...
@@ -68,7 +68,7 @@ export default {
beforeDestroy
()
{},
methods
:
{
onSelectMount
(
item
)
{
this
.
$store
.
commit
(
"MMCFlightControlCenter/uav
Applications
/setState"
,
{
this
.
$store
.
commit
(
"MMCFlightControlCenter/uav/setState"
,
{
key
:
"selectMount"
,
value
:
item
,
});
...
...
@@ -78,7 +78,7 @@ export default {
*/
mountDirective
(
buffer
)
{
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/mountDirective"
,
"MMCFlightControlCenter/uav/mountDirective"
,
{
buffer
,
mountId
:
this
.
selectMount
.
mountId
,
...
...
@@ -95,7 +95,7 @@ export default {
* 挂载窗口关闭
*/
mountClose
()
{
this
.
$store
.
commit
(
"MMCFlightControlCenter/uav
Applications
/setState"
,
{
this
.
$store
.
commit
(
"MMCFlightControlCenter/uav/setState"
,
{
key
:
"selectMount"
,
value
:
null
,
});
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/index.vue
浏览文件 @
2fc45db9
...
...
@@ -141,7 +141,7 @@ export default {
};
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
,
"airlineData"
,
]),
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/index.vue
浏览文件 @
2fc45db9
...
...
@@ -44,7 +44,7 @@ export default {
};
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
"uavRealTimeData"
]),
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uavRealTimeData"
]),
uavData
()
{
// console.log("this.uavRealTimeData", this.uavRealTimeData);
return
{
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/player/components/obstacle/index.vue
浏览文件 @
2fc45db9
...
...
@@ -120,7 +120,7 @@ export default {
},
computed
:
{
obstacle
()
{
return
this
.
$store
.
state
.
MMCFlightControlCenter
.
uav
Applications
.
uavRealTimeData
.
obstacle
;
return
this
.
$store
.
state
.
MMCFlightControlCenter
.
uav
.
uavRealTimeData
.
obstacle
;
},
},
watch
:
{
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/player/index.vue
浏览文件 @
2fc45db9
...
...
@@ -667,7 +667,7 @@ export default {
},
// 无人机实时数据
uavRealTimeData
()
{
return
this
.
$store
.
state
.
MMCFlightControlCenter
.
uav
Applications
return
this
.
$store
.
state
.
MMCFlightControlCenter
.
uav
.
uavRealTimeData
;
},
// 健康监测数据
...
...
@@ -855,7 +855,7 @@ export default {
return
this
.
$message
.
error
(
"录像失败,NX通信异常!"
);
}
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/videoTranscribe"
,
"MMCFlightControlCenter/uav/videoTranscribe"
,
{
playerFormat
:
this
.
streamSelect
,
videoID
:
1
,
// 视频通道ID(需保持唯一)
...
...
@@ -881,7 +881,7 @@ export default {
return
this
.
$message
.
error
(
"拍照失败,NX通信异常!"
);
}
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/takePhotos"
,
"MMCFlightControlCenter/uav/takePhotos"
,
{
playerFormat
:
this
.
streamSelect
,
videoID
:
1
,
// 视频通道ID(需保持唯一)
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/uavList/components/list/components/item/index.vue
浏览文件 @
2fc45db9
...
...
@@ -108,11 +108,11 @@ export default {
},
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
"uav"
]),
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
]),
...
mapState
(
"MMCFlightControlCenter"
,
[
"userInfo"
]),
},
methods
:
{
...
mapActions
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapActions
(
"MMCFlightControlCenter/uav"
,
[
"showPlayer"
,
"showPanel"
,
]),
...
...
src/components/MMCFlightControlCenter/components/uavApplications/index.vue
浏览文件 @
2fc45db9
...
...
@@ -38,7 +38,7 @@ export default {
};
},
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav
Applications
"
,
[
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uav"
,
"showPlayer"
,
"showPanel"
,
...
...
@@ -335,7 +335,7 @@ export default {
}
},
onPlayerClose
(){
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/showPlayer"
,
this
.
uav
);
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav/showPlayer"
,
this
.
uav
);
}
},
};
...
...
src/components/MMCFlightControlCenter/components/uavApplications/mixins/linkFusion.js
浏览文件 @
2fc45db9
...
...
@@ -2,7 +2,7 @@
export
default
{
computed
:
{
/* uav() {
return this.$store.state.MMCFlightControlCenter.uav
Applications
.uav;
return this.$store.state.MMCFlightControlCenter.uav.uav;
}, */
// mqtt实时数据
mqttDataSet
()
{
...
...
@@ -30,7 +30,7 @@ export default {
if
(
this
.
uav
?.
network
===
1
)
{
if
(
newVal
)
{
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/updateByMQTT"
,
"MMCFlightControlCenter/uav/updateByMQTT"
,
newVal
);
}
...
...
@@ -40,7 +40,7 @@ export default {
if
(
this
.
uav
?.
network
==
0
)
{
if
(
newVal
)
{
this
.
$store
.
dispatch
(
"MMCFlightControlCenter/uav
Applications
/updateByMQTT"
,
"MMCFlightControlCenter/uav/updateByMQTT"
,
newVal
);
}
...
...
@@ -49,7 +49,7 @@ export default {
},
async
created
()
{
// 模拟飞机数据上报
// this.$store.dispatch("MMCFlightControlCenter/uav
Applications
/test", { open: true });
// this.$store.dispatch("MMCFlightControlCenter/uav/test", { open: true });
// 启动mqtt服务
try
{
this
.
$store
...
...
src/components/MMCFlightControlCenter/store/index.js
浏览文件 @
2fc45db9
import
uav
Applications
from
"./uavApplications
"
;
import
uav
from
"./uav
"
;
export
default
{
namespaced
:
true
,
...
...
@@ -90,6 +90,6 @@ export default {
},
},
modules
:
{
uav
Applications
,
uav
,
},
};
src/components/MMCFlightControlCenter/store/uav
Applications
.js
→
src/components/MMCFlightControlCenter/store/uav.js
浏览文件 @
2fc45db9
...
...
@@ -1255,7 +1255,7 @@ const actions = {
export
default
{
namespaced
:
true
,
name
:
"uav
Applications
"
,
name
:
"uav"
,
state
,
mutations
,
actions
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论