From 5619c9ddfb2f27963f61d6a9fa88671cbbad1da0 Mon Sep 17 00:00:00 2001 From: zjc <1034206993@qq.com> Date: Wed, 5 Mar 2025 19:59:23 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/title-3-select.png | Bin 0 -> 8348 bytes src/layout/components/Header/index.vue | 73 ++++++++++++++++++++---- src/views/hotel/components/info-box.vue | 6 +- src/views/scenic/components/big-map.vue | 8 ++- src/views/traffic/components/box-2.vue | 16 ++---- 5 files changed, 73 insertions(+), 30 deletions(-) create mode 100644 src/assets/images/title-3-select.png diff --git a/src/assets/images/title-3-select.png b/src/assets/images/title-3-select.png new file mode 100644 index 0000000000000000000000000000000000000000..b78514f935028a543974efcef41bb0ae9e710cc1 GIT binary patch literal 8348 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 m%)n_Nos3yN-Nz684E!Iu%afqrPf}?B0000 {{ item.name }} @@ -18,7 +18,7 @@ ['/scenic', '/hotel'].includes(router.currentRoute.value.path) && otherLeftNav.length > 0 " trigger="click" - @command="handleCommand" + @command="handleCommand($event, 'hotel')" >
  • {{ item.name }}
    • + +
  • + {{ otherRightLabel }} + +
    • + +
    {{ weatherData?.temperature }}-{{ weatherData?.skycon }} @@ -70,7 +97,9 @@ import { useRouter } from 'vue-router' import title2 from '@/assets/images/title-2.png' + import title3 from '@/assets/images/title-3.png' import title2Select from '@/assets/images/title-2-select.png' + import title3Select from '@/assets/images/title-3-select.png' import { getWeatherApi } from '@/api/home' import { getSpotListApi } from '@/api/sentiment' @@ -87,9 +116,11 @@ let navRight = ref([]) let isSkip = ref(true) let isBack = ref(false) - let current = ref(0) + let current = ref(1) let otherLeftLabel = ref('') + let otherRightLabel = ref('') let otherLeftNav = ref([]) + let otherRightNav = ref([]) let spotList = ref([]) // 补零 @@ -115,9 +146,15 @@ const handleBack = () => { router.push('/home') } - const handleCommand = (item) => { + const handleCommand = (item, type) => { current.value = '' - otherLeftLabel.value = item.name + if (type === 'hotel') { + otherRightLabel.value = '其他场馆' + otherLeftLabel.value = item.name + } else { + otherLeftLabel.value = '其他酒店' + otherRightLabel.value = item.name + } switch (router.currentRoute.value.path) { case '/scenic': pubSub.publish('scenicChange', item) @@ -131,19 +168,21 @@ } } // 点击导航 - const handleNav = (item, index) => { + const handleNav = (item) => { if (isSkip.value) { router.push(item.path) } else { - if (current.value === index) return + if (current.value === item.id) return otherLeftLabel.value = '其他酒店' - current.value = index - title.value = item.name + otherRightLabel.value = '其他场馆' + current.value = item.id switch (router.currentRoute.value.path) { case '/scenic': + title.value = item.name pubSub.publish('scenicChange', item) break case '/monitor': + title.value = item.name pubSub.publish('monitorChange', item) break case '/hotel': @@ -167,6 +206,8 @@ const setNav = async () => { navLeft.value = [] navRight.value = [] + otherLeftNav.value = [] + otherRightNav.value = [] switch (router.currentRoute.value.path) { case '/home': title.value = '奉节县旅游指挥调度中心' @@ -273,13 +314,17 @@ case '/hotel': title.value = '酒店场馆' otherLeftLabel.value = '其他酒店' + otherRightLabel.value = '其他场馆' isSkip.value = false current.vlaue = '' isBack.value = true let hotelRes = await getHotelListApi({ hotelStadiumType: 1 }) navLeft.value = hotelRes.data.slice(0, 3) - pubSub.publish('hotelChange', hotelRes.data[0]) otherLeftNav.value = hotelRes.data.slice(3, hotelRes.data.length - 1) + let venueRes = await getHotelListApi({ hotelStadiumType: 2 }) + navRight.value = venueRes.data.slice(0, 3) + otherRightNav.value = venueRes.data.slice(3, venueRes.data.length - 1) + pubSub.publish('hotelChange', hotelRes.data[0]) break } } @@ -411,6 +456,10 @@ color: rgba(208, 236, 255, 0.9); background-image: url('@/assets/images/title-3.png'); background-size: 100% 100%; + .icon { + width: vw(18); + height: vw(18); + } } } } diff --git a/src/views/hotel/components/info-box.vue b/src/views/hotel/components/info-box.vue index 56dcaa6..4df9375 100644 --- a/src/views/hotel/components/info-box.vue +++ b/src/views/hotel/components/info-box.vue @@ -88,7 +88,6 @@ diff --git a/src/views/scenic/components/big-map.vue b/src/views/scenic/components/big-map.vue index a1347c5..b4bdd2d 100644 --- a/src/views/scenic/components/big-map.vue +++ b/src/views/scenic/components/big-map.vue @@ -147,7 +147,6 @@ if (map.value && modelValue.value) { // 109.645729,31.041203 if (carOverlays.value.length > 0) { - console.log(11111) // 更新车辆marker位置 let flag = false for (let i = 0; i < carOverlays.value.length; i++) { @@ -159,7 +158,7 @@ lat: props.carList[j].lat }) flag = true - break + continue } } } @@ -175,11 +174,14 @@ lng: props.carList[i].lng, lat: props.carList[i].lat }) + currentMarker.value.setPosition({ + lng: props.carList[i].lng, + lat: props.carList[i].lat + }) break } } } else { - console.log(2222) props.carList.map((item, i) => { if (item.lng && item.lat) { addMarker(carIcon, [item.lng, item.lat], [36, 50]) diff --git a/src/views/traffic/components/box-2.vue b/src/views/traffic/components/box-2.vue index 7ae40f7..290a7e9 100644 --- a/src/views/traffic/components/box-2.vue +++ b/src/views/traffic/components/box-2.vue @@ -12,7 +12,7 @@ -
    +
    @@ -183,16 +183,7 @@ background-size: 100% 100%; } } - .traffic-map { - position: relative; - z-index: 9; - width: vw(1500); - height: vh(955); - margin-left: vw(8); - box-sizing: border-box; - background-image: url('/src/assets/images/map-bg-2.png'); - background-size: 100% 100%; - } + .traffic-map-big { position: relative; z-index: 9; @@ -203,6 +194,9 @@ background-image: url('/src/assets/images/map-bg-2.png'); background-size: 100% 100%; } + .traffic-map { + width: vw(1500) !important; + } .video-list { width: vw(320); height: vh(120);