Browse Source

refactor: ♻️ 修改类型声明文件

pull/1/head
姜鑫 3 years ago
parent
commit
92e6b3f229
  1. 16
      src/composables/useFacilityNav.ts
  2. 10
      src/composables/useStartNavi.ts
  3. 4
      src/types/map.d.ts
  4. 2
      src/types/shop.d.ts
  5. 2
      src/utils/Class/Brand.ts

16
src/composables/useFacilityNav.ts

@ -6,17 +6,17 @@ export const useFacilityNav = () => {
const store = useStore()
const router = useRouter()
// eslint-disable-next-line max-params
function _handleFacility(name: string, floorOrder: number, floorName: string, logoPath: string, yaxis: number) {
const shop = new Brand({ shopName: name, floorOrder, floor: floorName, logoUrl: logoPath, yaxis })
store.SET_SHOP(shop)
}
function handleFacility(item: Facility) {
const facility = window.Map_QM.pathIcon({ type: item.abbreviation })
const floorName = store.currentBuildingFloorsList.find(floor => floor.floorOrder === facility.floor)?.floor
_handleFacility(item.customFacilityName, facility.floor, floorName as string, item.filePath, facility.node as any)
const shop = new Brand({
shopName: item.customFacilityName,
floorOrder: facility.floor,
floor: floorName as string,
logoUrl: item.filePath,
yaxis: facility.node
})
store.SET_SHOP(shop)
router.push('/nav')
}

10
src/composables/useStartNavi.ts

@ -12,7 +12,7 @@ export const useStartNavi = (shop: Ref<Shop>, currentFloor: Ref<CurrentFloor>, s
})
//导航动画
function startNavi({ floorOrder, yaxis }: { floorOrder: number; yaxis: number }) {
function startNavi({ floorOrder, yaxis }: { floorOrder: number; yaxis: number | string }) {
try {
window.Map_QM.pathNode({ floor: floorOrder, node: yaxis }, backPathArray)
} catch (error) {
@ -35,7 +35,7 @@ export const useStartNavi = (shop: Ref<Shop>, currentFloor: Ref<CurrentFloor>, s
textEn: 'Move forward',
icon: require('@/assets/images/nav/big_up.svg'), //大的方向箭头
passIcon: require('@/assets/images/nav/up_thumb.svg'), //经过店铺时的那个小箭头
class: 'animate__fadeInUp' //动画样式
class: 'animate__fadeInUp up' //动画样式
}
case '向后出发':
@ -44,7 +44,7 @@ export const useStartNavi = (shop: Ref<Shop>, currentFloor: Ref<CurrentFloor>, s
textEn: 'Departure backwards',
icon: require('@/assets/images/nav/big_down.svg'),
passIcon: require('@/assets/images/nav/down_thumb.svg'),
class: 'animate__fadeInDown'
class: 'animate__fadeInDown down'
}
case '向左出发':
@ -53,7 +53,7 @@ export const useStartNavi = (shop: Ref<Shop>, currentFloor: Ref<CurrentFloor>, s
textEn: 'Departure to the left',
icon: require('@/assets/images/nav/big_left.svg'),
passIcon: require('@/assets/images/nav/left_thumb.svg'),
class: 'animate__fadeInRight'
class: 'animate__fadeInRight left'
}
case '向右出发':
@ -62,7 +62,7 @@ export const useStartNavi = (shop: Ref<Shop>, currentFloor: Ref<CurrentFloor>, s
textEn: 'Departure to the right',
icon: require('@/assets/images/nav/big_right.svg'),
passIcon: require('@/assets/images/nav/right_thumb.svg'),
class: 'animate__fadeInLeft'
class: 'animate__fadeInLeft right'
}
default:
return {

4
src/types/map.d.ts

@ -197,8 +197,8 @@ export declare global {
*/
pathNode(
obj: { floor: number; node: number },
callBackFun: ({ direction, wayList }: { direction: '向前出发' | '向后出发' | '向左出发' | '向右出发'; wayList: Shop[] }) => void
obj: { floor: number; node: number | string },
callBackFun: ({ direction, wayList }: { direction: Direction; wayList: Shop[] }) => void
): void
/**

2
src/types/shop.d.ts

@ -3,7 +3,7 @@ declare interface Shop {
floor: string
floorOrder: number
logoUrl: string
yaxis: number
yaxis: number | string
shopCode?: string
shopNameEn?: string
initials?: string

2
src/utils/Class/Brand.ts

@ -9,7 +9,7 @@ export default class Brand {
floorOrder: number
floor: string
logoUrl: string
yaxis: number
yaxis: number | string
constructor({ shopName, floorOrder, floor, logoUrl, yaxis }: PickShop) {
this.shopName = shopName
this.floorOrder = floorOrder

Loading…
Cancel
Save