|
@@ -191,7 +191,9 @@
|
|
|
<div>
|
|
|
<RoomMore
|
|
|
v-if="popupType == 'roomMore'"
|
|
|
+ @change="changeRoom"
|
|
|
:FORUMArr="FORUMArr"
|
|
|
+ :roomInfo="roomInfo"
|
|
|
></RoomMore>
|
|
|
<LightMore
|
|
|
v-if="popupType == 'lamp'"
|
|
@@ -307,6 +309,8 @@ const hasExecutedModeScene = ref(false)
|
|
|
const store = useStore()
|
|
|
|
|
|
onMounted(async () => {
|
|
|
+ console.log('========重新执行了');
|
|
|
+
|
|
|
// TODO: 切换语言
|
|
|
type.value = localStorage.getItem('lang') || 'zh-CN'
|
|
|
locale.value = type.value
|
|
@@ -417,7 +421,7 @@ const getSpaceScene = params => {
|
|
|
if (nowTimestamp + 1000 * 30 >= startTimestamp && nowTimestamp <= endTimestamp + 1000 * 30) {
|
|
|
// TODO 会议场景
|
|
|
if (!hasExecutedModeScene.value) {
|
|
|
- spaceScene.value = modeScene || 'Meeting' // Meeting SceneDefaul
|
|
|
+ spaceScene.value = modeScene // Meeting SceneDefaul
|
|
|
initSpace()
|
|
|
sendCommand()
|
|
|
hasExecutedModeScene.value = true
|
|
@@ -453,7 +457,7 @@ const initSpace = () => {
|
|
|
modeType.value = modeData.value[0].id
|
|
|
spaceDevice.value = modeData.value[0]
|
|
|
|
|
|
- lampScenceControlGroup.value.value = modeType.value
|
|
|
+ lampScenceControlGroup.value.value = Number(modeType.value)
|
|
|
}
|
|
|
|
|
|
// 切换场景模式
|
|
@@ -462,7 +466,8 @@ const changeMode = type => {
|
|
|
if (modeType.value == 3) {
|
|
|
spaceDevice.value.custom = true
|
|
|
}
|
|
|
- lampScenceControlGroup.value.value = modeType.value
|
|
|
+ lampScenceControlGroup.value.value = Number(modeType.value)
|
|
|
+
|
|
|
// 切换模式重新下发指令
|
|
|
sendCommand()
|
|
|
}
|
|
@@ -484,7 +489,7 @@ const getLampScenceControlGroupId = () => {
|
|
|
category: 'SELTLG'
|
|
|
}
|
|
|
findForServe(params).then(res => {
|
|
|
- lampScenceControlGroup.value.id = res.data[0] ?.id
|
|
|
+ lampScenceControlGroup.value.id = res.data[0]?.id
|
|
|
})
|
|
|
}
|
|
|
|
|
@@ -667,11 +672,22 @@ const handleError = error => {
|
|
|
// 跳转到错误页面
|
|
|
router.push('/error')
|
|
|
}
|
|
|
+const changeRoom = item => {
|
|
|
+ router.push({
|
|
|
+ path: '/index',
|
|
|
+ query: {
|
|
|
+ id: item.id
|
|
|
+ }
|
|
|
+ }).then(() => {
|
|
|
+ // 刷新页面
|
|
|
+ // window.location.reload();
|
|
|
+ });
|
|
|
+}
|
|
|
|
|
|
//TODO: 8*************长按出培训室空间切换*************
|
|
|
// 添加长按相关变量
|
|
|
const pressTimerLogo = ref(null);
|
|
|
-const pressDurationLogo = 1000 * 10; // 长按时间阈值(10秒)
|
|
|
+const pressDurationLogo = 1000 * 1; // 长按时间阈值(10秒)
|
|
|
|
|
|
// 开始按压图标
|
|
|
const startPressLogo = () => {
|
|
@@ -748,7 +764,7 @@ onUnmounted(() => {
|
|
|
.video-image {
|
|
|
position: absolute;
|
|
|
left: 50%;
|
|
|
- top: 0;
|
|
|
+ top: -30px;
|
|
|
transform: translateX(-50%);
|
|
|
// width: 1020px;
|
|
|
// height: auto;
|