Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
M
mmc-stl-vue2
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Administrator
mmc-stl-vue2
Commits
2c3c6371
提交
2c3c6371
authored
10月 23, 2024
作者:
翁进城
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 对接天气接口
上级
c38ee979
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
78 行增加
和
11 行删除
+78
-11
index.js
src/components/MMCFlightControlCenter/api/index.js
+3
-2
system.js
src/components/MMCFlightControlCenter/api/modules/system.js
+16
-0
index.vue
...enter/components/hangar/components/controlPanel/index.vue
+1
-1
index.vue
...s/components/controlPanel/components/controlTop/index.vue
+58
-8
没有找到文件。
src/components/MMCFlightControlCenter/api/index.js
浏览文件 @
2c3c6371
...
@@ -3,4 +3,5 @@ export { default as AirLine } from './modules/airLine';
...
@@ -3,4 +3,5 @@ export { default as AirLine } from './modules/airLine';
export
{
default
as
Map
}
from
'./modules/map'
;
export
{
default
as
Map
}
from
'./modules/map'
;
export
{
default
as
AI_API
}
from
'./modules/ai'
;
export
{
default
as
AI_API
}
from
'./modules/ai'
;
export
{
default
as
ViewLibrary
}
from
'./modules/viewLibrary'
;
export
{
default
as
ViewLibrary
}
from
'./modules/viewLibrary'
;
export
{
default
as
TaskInfo
}
from
'./modules/taskInfo'
;
export
{
default
as
TaskInfo
}
from
'./modules/taskInfo'
;
\ No newline at end of file
export
{
default
as
System
}
from
'./modules/system'
;
\ No newline at end of file
src/components/MMCFlightControlCenter/api/modules/system.js
0 → 100644
浏览文件 @
2c3c6371
import
request
from
"../request"
;
export
default
class
System
{
/**
* 获取天气数据
* @param {*} data
* @returns
*/
static
getCoordinatesWeather
(
params
)
{
return
request
({
url
:
'/admin-api/system/weather/getCoordinatesWeather'
,
method
:
"get"
,
params
});
}
}
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/index.vue
浏览文件 @
2c3c6371
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<ControlBottom
isHangar
></ControlBottom>
<ControlBottom
isHangar
></ControlBottom>
<ControlRight></ControlRight>
<ControlRight></ControlRight>
<!-- 顶部信息 -->
<!-- 顶部信息 -->
<ControlTop></ControlTop>
<ControlTop
isHangar
></ControlTop>
</div>
</div>
</
template
>
</
template
>
...
...
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlTop/index.vue
浏览文件 @
2c3c6371
...
@@ -5,16 +5,16 @@
...
@@ -5,16 +5,16 @@
<div>
{{
week
}}
{{
time
}}
</div>
<div>
{{
week
}}
{{
time
}}
</div>
</div>
</div>
<div
class=
"ct-item ct-weather"
>
<div
class=
"ct-item ct-weather"
>
<img
class=
"ctw-icon"
src=
"./assets/images/weather/icon/day/00.png
"
/>
<img
class=
"ctw-icon"
:src=
"weatherIcon
"
/>
<div
class=
"ctw-wind"
>
<div
class=
"ctw-wind"
>
<div
class=
"ctww-line1"
>
<div
class=
"ctww-line1"
>
<
img
src=
"./assets/images/wind.png"
/
>
<
!--
<img
:src=
"weatherIcon"
/>
--
>
<div>
东北风
</div>
<div>
{{
weather
.
windDirection
}}
</div>
</div>
</div>
<div>
0.2~0.6
m/s
</div>
<div>
{{
weather
.
windSpeed
}}
m/s
</div>
</div>
</div>
</div>
</div>
<div
class=
"ct-item ct-take-off"
>
适宜起飞
</div>
<div
class=
"ct-item ct-take-off"
>
{{
weather
.
flyStatus
?
'适宜起飞'
:
'不宜起飞'
}}
</div>
<div
class=
"ct-item ct-info"
>
<div
class=
"ct-item ct-info"
>
<!-- 避障雷达 -->
<!-- 避障雷达 -->
<el-tooltip
<el-tooltip
...
@@ -112,12 +112,19 @@
...
@@ -112,12 +112,19 @@
import
dayjs
from
"dayjs"
;
import
dayjs
from
"dayjs"
;
import
{
mapState
}
from
"vuex"
;
import
{
mapState
}
from
"vuex"
;
import
TakeOverRecords
from
"./components/takeOverRecords"
;
import
TakeOverRecords
from
"./components/takeOverRecords"
;
import
{
System
}
from
"../../../../../../api"
;
export
default
{
export
default
{
name
:
"ControlTop"
,
name
:
"ControlTop"
,
components
:
{
components
:
{
TakeOverRecords
,
TakeOverRecords
,
},
},
props
:
{
isHangar
:
{
type
:
Boolean
,
default
:
false
,
},
},
data
()
{
data
()
{
return
{
return
{
date
:
""
,
date
:
""
,
...
@@ -160,10 +167,23 @@ export default {
...
@@ -160,10 +167,23 @@ export default {
"-4"
:
"航向偏左"
,
"-4"
:
"航向偏左"
,
},
},
showTakeOverRecords
:
false
,
// 显示接管记录
showTakeOverRecords
:
false
,
// 显示接管记录
timeWeather
:
null
,
weather
:
{
windSpeed
:
0
,
minTemp
:
0
,
maxTemp
:
0
,
windDirection
:
"未知"
,
humidity
:
0
,
temp
:
0
,
windLevel
:
0
,
conditionDay
:
"未知"
,
},
weatherIcon
:
require
(
`./assets/images/weather/icon/iconfont/W0.png`
)
};
};
},
},
computed
:
{
computed
:
{
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uavRealTimeData"
]),
...
mapState
(
"MMCFlightControlCenter/uav"
,
[
"uavRealTimeData"
]),
...
mapState
(
"MMCFlightControlCenter/hangar"
,
[
"hangar"
]),
// 网络判断 公网|专网
// 网络判断 公网|专网
network
()
{
network
()
{
let
{
uavRealTimeData
}
=
this
;
let
{
uavRealTimeData
}
=
this
;
...
@@ -310,12 +330,13 @@ export default {
...
@@ -310,12 +330,13 @@ export default {
},
},
created
()
{
created
()
{
this
.
updateTime
();
this
.
updateTime
();
this
.
timeHandler
=
setInterval
(
()
=>
{
this
.
timeHandler
=
setInterval
(
this
.
updateTime
,
1000
);
this
.
updateTime
();
this
.
getWeather
();
},
1
000
);
this
.
timeWeather
=
setInterval
(
this
.
getWeather
,
60
000
);
},
},
beforeDestroy
()
{
beforeDestroy
()
{
clearInterval
(
this
.
timeHandler
);
clearInterval
(
this
.
timeHandler
);
clearInterval
(
this
.
timeWeather
);
},
},
methods
:
{
methods
:
{
updateTime
()
{
updateTime
()
{
...
@@ -413,6 +434,35 @@ export default {
...
@@ -413,6 +434,35 @@ export default {
});
});
}
}
},
},
/**
* 获取天气数据
*/
async
getWeather
()
{
let
lat
;
let
lon
;
if
(
this
.
isHangar
)
{
lat
=
this
.
hangar
.
latitude
;
lon
=
this
.
hangar
.
longitude
;
}
else
{
// 无人机需要通过实时数据获取经纬度
if
(
this
.
uavRealTimeData
?.
locationCoordinate3D
?.
latitude
)
{
lat
=
this
.
uavRealTimeData
.
locationCoordinate3D
.
latitude
;
lon
=
this
.
uavRealTimeData
.
locationCoordinate3D
.
longitude
;
}
}
if
(
lat
)
{
let
res
=
await
System
.
getCoordinatesWeather
({
lat
,
lon
,
});
this
.
weather
=
res
.
data
[
0
];
const
date
=
new
Date
();
let
time
=
date
.
getHours
();
this
.
weatherIcon
=
require
(
`./assets/images/weather/icon/iconfont/W
${
time
>=
18
?
this
.
weather
.
nightIcon
:
this
.
weather
.
dayIcon
}
.png`
);
}
},
},
},
};
};
</
script
>
</
script
>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论