From ccaf3c4e12b89598690d26985c8ab289c64e3719 Mon Sep 17 00:00:00 2001 From: zjc <1034206993@qq.com> Date: Fri, 28 Feb 2025 20:35:15 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hotel.js | 10 +++++ src/components/HlsPlayer/index.vue | 2 +- .../components/CoreVideo/allList.vue | 0 .../components/CoreVideo/index.vue | 0 .../components/Correspondence/index.vue | 0 src/{ => layout}/components/Header/index.vue | 27 ++++++------ src/layout/index.vue | 5 +++ src/views/hotel/components/info-box.vue | 42 +++++++++++++------ 8 files changed, 57 insertions(+), 29 deletions(-) create mode 100644 src/api/hotel.js rename src/{ => layout}/components/CoreVideo/allList.vue (100%) rename src/{ => layout}/components/CoreVideo/index.vue (100%) rename src/{ => layout}/components/Correspondence/index.vue (100%) rename src/{ => layout}/components/Header/index.vue (95%) diff --git a/src/api/hotel.js b/src/api/hotel.js new file mode 100644 index 0000000..156ddd3 --- /dev/null +++ b/src/api/hotel.js @@ -0,0 +1,10 @@ +import request from './request' + +// 获取酒店列表 +export function getHotelListApi(data) { + return request({ + url: '/fjtcc-api/api/largeScreen/hotel/list', + method: 'get', + params: data + }) +} diff --git a/src/components/HlsPlayer/index.vue b/src/components/HlsPlayer/index.vue index 3722b6f..2dc7ebc 100644 --- a/src/components/HlsPlayer/index.vue +++ b/src/components/HlsPlayer/index.vue @@ -227,7 +227,7 @@ }, handleHlsError(data) { - console.error('HLS Error:', data) + // console.error('HLS Error:', data) if (data.fatal) { switch (data.type) { case Hls.ErrorTypes.NETWORK_ERROR: diff --git a/src/components/CoreVideo/allList.vue b/src/layout/components/CoreVideo/allList.vue similarity index 100% rename from src/components/CoreVideo/allList.vue rename to src/layout/components/CoreVideo/allList.vue diff --git a/src/components/CoreVideo/index.vue b/src/layout/components/CoreVideo/index.vue similarity index 100% rename from src/components/CoreVideo/index.vue rename to src/layout/components/CoreVideo/index.vue diff --git a/src/components/Correspondence/index.vue b/src/layout/components/Correspondence/index.vue similarity index 100% rename from src/components/Correspondence/index.vue rename to src/layout/components/Correspondence/index.vue diff --git a/src/components/Header/index.vue b/src/layout/components/Header/index.vue similarity index 95% rename from src/components/Header/index.vue rename to src/layout/components/Header/index.vue index 9e98a1b..76dce41 100644 --- a/src/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -71,6 +71,7 @@ import { getWeatherApi } from '@/api/home' import { getSpotListApi } from '@/api/sentiment' + import { getHotelListApi } from '@/api/hotel' import pubSub from 'pubsub-js' @@ -138,6 +139,9 @@ case '/monitor': pubSub.publish('monitorChange', item) break + case '/hotel': + pubSub.publish('hotelChange', item) + break } } } @@ -247,26 +251,14 @@ ] isBack.value = true break - case '/hotel': title.value = '酒店管理' isSkip.value = false current.vlaue = '' isBack.value = true - navLeft.value = [ - { - name: '酒店一' - }, - { - name: '酒店二' - }, - { - name: '酒店三' - }, - { - name: '酒店四' - } - ] + let hotelRes = await getHotelListApi() + navLeft.value = hotelRes.data + pubSub.publish('hotelChange', hotelRes.data[0]) break } } @@ -368,8 +360,13 @@ font-weight: 600; font-size: vw(28); text-align: center; + padding: 0 vw(30); color: rgba(208, 236, 255, 0.9); background-size: 100% 100%; + text-overflow: ellipsis; + overflow: hidden; + word-break: break-all; + white-space: nowrap; .icon { width: vw(18); height: vw(18); diff --git a/src/layout/index.vue b/src/layout/index.vue index 7c73253..9c962a9 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -11,6 +11,11 @@