diff --git a/public/static/offline/JSON/GetDevCoordinateByIP.json b/public/static/offline/JSON/GetDevCoordinateByIP.json index 600c02a..6cf0624 100644 --- a/public/static/offline/JSON/GetDevCoordinateByIP.json +++ b/public/static/offline/JSON/GetDevCoordinateByIP.json @@ -1 +1 @@ -{"code":200,"msg":"success","data":{"machineCode":"fOjdaZJ0kCfJ2WCgszOKr","machineName":"12132","machineTypeName":"信发","label":"windows","screenAttribute":"1920*1080横屏","building":"主楼","buildingCode":"h-8eWvLqbPZP5cuWHY-vA","buildingOrder":0,"floor":"L1","floorCode":"p6U4SCkoJf9Xq5gBGpa3L","floorOrder":1,"ip":"192.168.1.209","mac":"4CEDFBCAFF27","location":"0","angle":"0","projectCode":"project-n-ww5jvpwnu0ads70lbkda"}} +{"code":200,"msg":"success","data":{"machineCode":"fOjdaZJ0kCfJ2WCgszOKr","machineName":"12132","machineTypeName":"信发","label":"windows","screenAttribute":"1920*1080横屏","building":"主楼","buildingCode":"h-8eWvLqbPZP5cuWHY-vA","buildingOrder":0,"floor":"L1","floorCode":"p6U4SCkoJf9Xq5gBGpa3L","floorOrder":3,"ip":"192.168.1.209","mac":"4CEDFBCAFF27","location":"0","angle":"0","projectCode":"project-n-ww5jvpwnu0ads70lbkda"}} diff --git a/src/assets/images/nav/floorTofloor.svg b/src/assets/images/nav/floorTofloor.svg index 0ed3105..7f31e6a 100644 --- a/src/assets/images/nav/floorTofloor.svg +++ b/src/assets/images/nav/floorTofloor.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/src/components/PathGroup/PathGroup.vue b/src/components/PathGroup/PathGroup.vue index 6bc4384..f49108a 100644 --- a/src/components/PathGroup/PathGroup.vue +++ b/src/components/PathGroup/PathGroup.vue @@ -113,7 +113,7 @@ defineExpose({ top: 495px; left: 64px; z-index: 1; - width: 653px; + width: 340px; height: 348px; animation-duration: 0.3s; animation-delay: 0.9s; diff --git a/src/components/ShopItem/ShopItem.vue b/src/components/ShopItem/ShopItem.vue index 53d72d1..e815544 100644 --- a/src/components/ShopItem/ShopItem.vue +++ b/src/components/ShopItem/ShopItem.vue @@ -3,7 +3,8 @@
diff --git a/src/plugins/index.ts b/src/plugins/index.ts index e3e00c3..3947b0a 100644 --- a/src/plugins/index.ts +++ b/src/plugins/index.ts @@ -4,6 +4,6 @@ import type { App } from 'vue' export function setupPlugins(app: App) { app.use(switchLanguage).use(VueLazyLoad, { - error: require('@/assets/images/stay_tuned.svg') + error: require('@/assets/images/header/logo.svg') }) } diff --git a/src/views/Brand/Brand.vue b/src/views/Brand/Brand.vue index 0387a0b..8693959 100644 --- a/src/views/Brand/Brand.vue +++ b/src/views/Brand/Brand.vue @@ -149,6 +149,8 @@ getBrandInfo().then(({ data }) => { //切换业态和字母按钮组 function changeType(item: any) { currentTypeId.value = item.order + formatIdx.value = 0 + copyShopList.value = [...shopList.value] } function resetIdx() { formatIdx.value = 0 diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue index 5ca3e66..20301f8 100644 --- a/src/views/Nav/Nav.vue +++ b/src/views/Nav/Nav.vue @@ -13,7 +13,7 @@ alt="" /> -
+

@@ -78,12 +78,7 @@

- +
@@ -201,12 +196,13 @@ function backModule() { //楼层显示内容 const dirFloor = computed(() => { const isT2B = device.value.floorOrder >= shop.value.floorOrder + const model = route.query?.type return { start: { floor: isT2B ? device.value.floor : shop.value.floor, // icon: isT2B ? require('../../assets/images/nav/icon_start.svg') : require('../../assets/images/nav/icon_end.svg'), txt: isT2B ? i18n.global.t('go.start') : i18n.global.t('go.end'), - rotate: isT2B ? 'rotate(180deg)' : 'rotate(0deg)' + rotate: model ? (isT2B ? 'rotate(90deg)' : 'rotate(-90deg)') : isT2B ? 'rotate(180deg)' : 'rotate(0deg)' }, end: { floor: isT2B ? shop.value.floor : device.value.floor, @@ -277,28 +273,32 @@ watch(shop, newVal => { } .floor-container { position: absolute; - top: 312px; - left: 80px; - z-index: 1; + top: 495px; + right: 48px; + z-index: 2; display: flex; align-items: center; - width: 56px; - height: 196px; + width: 260px; + height: 348px; text-align: center; + background: rgb(0 0 0 / 3%); + border-radius: 8px; flex-direction: column; .floor { display: flex; justify-content: center; align-items: center; - width: 56px; - height: 56px; - background-color: #fff; - border-radius: 4px; + width: 228px; + height: 96px; + background: #b7a475; + border-radius: 8px; .name { margin-right: 0; font-size: 28px; font-family: 'font_bold'; - color: #9b8c85; + color: #fff; + + @include no-wrap(); } // &.blue-mode { @@ -306,9 +306,25 @@ watch(shop, newVal => { } .dir { flex-shrink: 0; - width: 18px; - margin-top: 32px; - margin-bottom: 32px; + width: 56px; + margin-top: 34px; + margin-bottom: 34px; + } + + &.art-model { + top: 478px; + right: 48px; + width: 504px; + height: 72px; + background: transparent; + flex-direction: row; + .floor { + width: 200px; + height: 72px; + } + .dir { + margin: 0 24px; + } } } .nav-art {