提交 281fe7c3 作者: 温凯

fix:二次切换导航栏到无人机或其他机库时,舱内外视频依然显示在地图上,页面未自动刷新或显示为地图页面

上级 c44f0c0a
...@@ -101,6 +101,14 @@ export default { ...@@ -101,6 +101,14 @@ export default {
}; };
}, },
watch: { watch: {
'scene': {
handler(newVal) {
if(newVal){
this.reset()
}
},
},
userInfo: { userInfo: {
immediate: true, immediate: true,
handler() { handler() {
...@@ -217,12 +225,12 @@ export default { ...@@ -217,12 +225,12 @@ export default {
} }
// 连接ws监听接管请求数据 // 连接ws监听接管请求数据
let url = Control_API.getWebsocketUrl(); let url = this.url.wsUrl
const socket = new WebSocket(url); let token = this.$store.state.MMCFlightControlCenter.token
const socket = new WebSocket(`${url}?token=${token}`);
this.ws = socket; this.ws = socket;
socket.onopen = function () { socket.onopen = function () {
console.log("Connected to WebSocket server");
}; };
socket.onmessage = (event) => { socket.onmessage = (event) => {
...@@ -254,7 +262,7 @@ export default { ...@@ -254,7 +262,7 @@ export default {
} else { } else {
this.$message.warning("操作失败"); this.$message.warning("操作失败");
} }
} catch (e) {} } catch (e) { }
}) })
.catch(async () => { .catch(async () => {
await Control_API.updateControlUav({ await Control_API.updateControlUav({
...@@ -308,7 +316,33 @@ export default { ...@@ -308,7 +316,33 @@ export default {
beforeDestroy() { beforeDestroy() {
this.ws.close(); this.ws.close();
}, },
methods: {}, methods: {
reset() {
let cesiumEl = document.querySelector(".cesium-viewer");
// 判断cesium的父元素是否是layer-container来确定当前是否已经切换, 未切换就退出
if(cesiumEl.parentElement.id === 'layer-container'){
return;
}
let cesiumParentEl = document.querySelector("#layer-container");
let uavParentEl = document.querySelector("#playerUavParent");
let uavEl = document.querySelector("#playerUav");
let innerParentEl = document.querySelector("#playInnerParent");
let innerEl = document.querySelector("#playInner");
let outParentEl = document.querySelector("#playOutParent");
let outEl = document.querySelector("#playerOuter");
cesiumParentEl.innerHTML = "";
uavParentEl.innerHTML = "";
innerParentEl.innerHTML = "";
outParentEl.innerHTML = "";
cesiumParentEl.append(cesiumEl);
uavParentEl.append(uavEl);
innerParentEl.append(innerEl);
outParentEl.append(outEl);
},
},
}; };
</script> </script>
...@@ -361,15 +395,18 @@ export default { ...@@ -361,15 +395,18 @@ export default {
color: #fff; color: #fff;
} }
} }
.el-dialog__body { .el-dialog__body {
color: #fff; color: #fff;
} }
} }
* { * {
/* 滚动条整体样式 */ /* 滚动条整体样式 */
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 4px; /* 滚动条宽度 */ width: 4px;
/* 滚动条宽度 */
} }
//滚动条轨道 //滚动条轨道
...@@ -387,6 +424,7 @@ export default { ...@@ -387,6 +424,7 @@ export default {
background: #222222; background: #222222;
border-radius: 10px 10px 0px 0px; border-radius: 10px 10px 0px 0px;
border: 0; border: 0;
.hd { .hd {
box-sizing: border-box; box-sizing: border-box;
padding-left: 0px; padding-left: 0px;
...@@ -408,6 +446,7 @@ export default { ...@@ -408,6 +446,7 @@ export default {
z-index: 1; z-index: 1;
background: #222222; background: #222222;
border-radius: 10px 10px 10px 10px; border-radius: 10px 10px 10px 10px;
.dialog-header { .dialog-header {
box-sizing: border-box; box-sizing: border-box;
padding-left: 32px; padding-left: 32px;
...@@ -438,14 +477,12 @@ export default { ...@@ -438,14 +477,12 @@ export default {
align-items: center; align-items: center;
font-size: 20px; font-size: 20px;
font-family: YouSheBiaoTiHei; font-family: YouSheBiaoTiHei;
background-image: -webkit-linear-gradient( background-image: -webkit-linear-gradient(right,
right, #e3aa77,
#e3aa77, #f5cda9,
#f5cda9, #f9ecd3,
#f9ecd3, #fcdbb1,
#fcdbb1, #edb07a);
#edb07a
);
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
letter-spacing: 0; letter-spacing: 0;
...@@ -545,6 +582,7 @@ export default { ...@@ -545,6 +582,7 @@ export default {
} }
.el-input-number { .el-input-number {
.el-input-number__decrease, .el-input-number__decrease,
.el-input-number__increase { .el-input-number__increase {
bottom: 1px; bottom: 1px;
...@@ -572,6 +610,7 @@ export default { ...@@ -572,6 +610,7 @@ export default {
.popper__arrow::after { .popper__arrow::after {
border-bottom-color: #161d2d; border-bottom-color: #161d2d;
} }
// 所有下拉选择框样式 // 所有下拉选择框样式
&.el-select-dropdown { &.el-select-dropdown {
border: none; border: none;
...@@ -584,18 +623,17 @@ export default { ...@@ -584,18 +623,17 @@ export default {
.option.hover, .option.hover,
.option:hover { .option:hover {
background-image: linear-gradient( background-image: linear-gradient(90deg,
90deg, rgba(44, 135, 176, 0.7) 0%,
rgba(44, 135, 176, 0.7) 0%, rgba(26, 100, 139, 0.37) 51%,
rgba(26, 100, 139, 0.37) 51%, rgba(7, 61, 98, 0.7) 100%);
rgba(7, 61, 98, 0.7) 100%
);
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
font-size: 12px; font-size: 12px;
color: #00f5ff; color: #00f5ff;
letter-spacing: 0; letter-spacing: 0;
font-weight: 400; font-weight: 400;
} }
.el-select-dropdown__item { .el-select-dropdown__item {
color: #fff; color: #fff;
...@@ -649,6 +687,7 @@ export default { ...@@ -649,6 +687,7 @@ export default {
&:not(.is-disabled):hover { &:not(.is-disabled):hover {
background: #4b4b4b; background: #4b4b4b;
} }
&:not(.is-disabled):focus { &:not(.is-disabled):focus {
background: #4b4b4b; background: #4b4b4b;
} }
...@@ -670,6 +709,7 @@ export default { ...@@ -670,6 +709,7 @@ export default {
.el-popper { .el-popper {
background: #222222; background: #222222;
} }
// 日期选择器组件 // 日期选择器组件
&.el-time-range-picker, &.el-time-range-picker,
&.el-date-range-picker, &.el-date-range-picker,
...@@ -756,6 +796,7 @@ export default { ...@@ -756,6 +796,7 @@ export default {
.el-pagination { .el-pagination {
text-align: center; text-align: center;
.el-pager li { .el-pager li {
background: transparent !important; background: transparent !important;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论