-
-
- 车牌号
- {{ carInfo.carCode }}浙B88888
-
-
+ 车位号
- {{ carInfo.spaceNo }}S-B1-001-102区
-
+
- 车牌号
+ {{ carInfo.carCode }}浙B88888
-
-
- 停车时长
- {{ carInfo.parkingTime }}1小时30分钟
-
-
+ 停车费用
- {{ carInfo.spaceNo }}30元
-
+
+ 车位号
+ {{ carInfo.spaceNo }}S-B1-001-102区
+
+
停车时长
+ {{ carInfo.parkingTime }}1小时30分钟
@@ -140,14 +132,8 @@ function go() {
position: absolute;
bottom: 102px;
left: 368px;
- .row {
- @include fl();
- }
}
.car-group {
- &.mr120 {
- margin-right: 100px;
- }
.tip {
padding-bottom: 16px;
font-size: 20px;
diff --git a/src/components/CarSearch/CarSearch.vue b/src/components/CarSearch/CarSearch.vue
new file mode 100644
index 0000000..e9d6c63
--- /dev/null
+++ b/src/components/CarSearch/CarSearch.vue
@@ -0,0 +1,163 @@
+
+
-
+
+
+
+
+
+
+
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 7c09ded..79ca61c 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -28,7 +28,7 @@
+ 
+
+
+
+
+
+ 
+
+ {{ $t('searchCar') }}
+ 已为您搜索到以下车位号，选择车位号进行导航
+
+
+ {{ item }}
+
+
{{ shop.industryCode }}
+ {{ shop.shopCode }}
@@ -220,6 +220,9 @@ function handleDetail() {
background: #8a766a;
border-radius: 14px 14px 0 0;
.name {
+ @include no-wrap;
+
+ width: 180px;
margin-bottom: 4px;
font-size: 14px;
font-family: 'font_bold';
@@ -229,6 +232,9 @@ function handleDetail() {
line-height: 22px;
}
.nameEn {
+ @include no-wrap;
+
+ width: 180px;
font-size: 10px;
font-family: 'font_bold';
color: rgb(255 255 255 / 60%);
@@ -238,6 +244,8 @@ function handleDetail() {
}
}
.middle {
+ @include fl();
+
width: 200px;
height: 32px;
padding: 10px 16px;
diff --git a/src/components/PlateInput/PlateInput.vue b/src/components/PlateInput/PlateInput.vue
index 1ec43f4..598ea9b 100644
--- a/src/components/PlateInput/PlateInput.vue
+++ b/src/components/PlateInput/PlateInput.vue
@@ -4,8 +4,8 @@
-
@@ -18,7 +18,7 @@
+
(), {
const PLATE_LENGTH = 8 //车牌长度
const renderInputLength = computed(() => (props.searchMethod === '车牌' ? PLATE_LENGTH : props.spaceLength))
-const btnText = computed(() => (props.searchMethod === '车牌' ? '自主寻车' : '寻车导航'))
+const btnText = computed(() => (props.searchMethod === '车牌' ? '自主寻车' : '搜索'))
const emits = defineEmits(['handle-energy', 'confirm'])
const isEnergy = ref(false)
@@ -53,6 +53,9 @@ function handleEnergy() {
})
}
function confirm() {
+ if (props.list.length < 3 && props.searchMethod === '车位') {
+ return
+ }
emits('confirm')
}
@@ -77,6 +80,8 @@ $btn-width: 197px;
.plate-container {
position: relative;
display: flex;
+ justify-content: space-between;
+ width: 856px;
margin-bottom: 40px;
&::before {
position: absolute;
@@ -92,6 +97,9 @@ $btn-width: 197px;
}
.input-wrapper {
display: flex;
+ .space {
+ width: 128px;
+ }
}
.input {
position: relative;
@@ -149,7 +157,6 @@ $btn-width: 197px;
width: $btn-width;
height: $height;
padding: 0 58px;
- margin-left: 38px;
font-size: $btn-font-size;
font-family: 'font_bold';
color: $btn-color;
@@ -162,5 +169,8 @@ $btn-width: 197px;
transition: all 0.3s;
}
}
+ .dis {
+ background: rgb(0 0 0 / 20%);
+ }
}
diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue
index 05b24b5..4b092f3 100644
--- a/src/components/PublicComponent/PublicComponent.vue
+++ b/src/components/PublicComponent/PublicComponent.vue
@@ -9,8 +9,11 @@
+
()
+ const searchList = ref([])
const store = useRootStore()
- const router = useRouter()
+ const { mapParkList } = toRefs(store)
+ // const router = useRouter()
async function confirm(plate: string, type: number) {
if (!type) {
if (!isLicensePlate(plate)) {
@@ -38,26 +41,24 @@ export const useFindCar = () => {
loading.value = false
}
} else {
- if (!plate.length) {
- Message({ type: 'success', text: '请输入正确的车位号' })
- return
- }
- const info = window.Map_QM.pathPark({ shopNum: plate })
- if (info?.node) {
- const floor: any = store.buildingList[0].floorList.find(item => item.floorOrder === info.floor)?.floor
- const shop = {
- shopCode: '',
- shopName: plate,
- floorOrder: info.floor,
- floor,
- logoUrl: '/static/img/tcjf.png',
- yaxis: info.node
- }
- store.SET_SHOP(shop)
- router.push('/nav')
- } else {
- Message({ text: `暂未查到相关信息`, type: 'success' })
- }
+ searchList.value = mapParkList.value.filter(item => item.includes(plate))
+ showCarSearch.value = true
+ // const info = window.Map_QM.pathPark({ shopNum: plate })
+ // if (info?.node) {
+ // const floor: any = store.buildingList[0].floorList.find(item => item.floorOrder === info.floor)?.floor
+ // const shop = {
+ // shopCode: '',
+ // shopName: plate,
+ // floorOrder: info.floor,
+ // floor,
+ // logoUrl: '/static/img/tcjf.png',
+ // yaxis: info.node
+ // }
+ // store.SET_SHOP(shop)
+ // router.push('/nav')
+ // } else {
+ // Message({ text: `暂未查到相关信息`, type: 'success' })
+ // }
}
}
@@ -67,5 +68,5 @@ export const useFindCar = () => {
const minutes = totalMinutes % 60
return `${hours > 0 ? `${hours}小时` : ''}${minutes > 0 ? ` ${minutes}分钟` : ''}`
}
- return { loading, result, showCarDetail, confirm }
+ return { loading, result, showCarDetail, confirm, searchList, showCarSearch }
}
diff --git a/src/composables/useInitMap.ts b/src/composables/useInitMap.ts
index 70d1661..e2edcc2 100644
--- a/src/composables/useInitMap.ts
+++ b/src/composables/useInitMap.ts
@@ -20,10 +20,17 @@ export const useInitMap = async function () {
store.SET_MAP_STATUS(true)
window.Map_QM.addEventListener('shop', onClickShop, false)
window.Map_QM.renderer.domElement.addEventListener('webglcontextlost', onContextLost)
+ const arr: string[] = []
+ window.Map_QM.util.allMap[0].buildArr.forEach((item: any) => {
+ item.mapData.parkArea.forEach((park: any) => {
+ arr.push(park.parkNum)
+ })
+ })
+ store.SET_MAP_PARK_LIST(arr)
},
{
build: device.value?.buildingOrder ?? 0,
- floor: device.value.floorOrder,
+ floor: 6,
navPoint: device.value.location,
angle: device.value.angle,
iconUrl: delPrefixOfFacilityList,
diff --git a/src/composables/useParkingKeyboard.ts b/src/composables/useParkingKeyboard.ts
index 3c0280e..e481941 100644
--- a/src/composables/useParkingKeyboard.ts
+++ b/src/composables/useParkingKeyboard.ts
@@ -4,7 +4,7 @@ import { isZhWord, isUppercaseWord } from '@/utils/utils'
export const useParkingKeyboard = () => {
const NOT_ENERGY_PLATE = 7 //非能源车牌长度
const ENERGY_PLATE = 8 //能源车牌长度
- const SPACE_MAX_LENGTH = 6 //车位最大允许长度
+ const SPACE_MAX_LENGTH = 3 //车位最大允许长度
const LICENSE = ['川', 'A'] //默认车牌前缀
const plate = ref(LICENSE.slice())
diff --git a/src/composables/useStartNavi.ts b/src/composables/useStartNavi.ts
index ae7aa9b..53861f0 100644
--- a/src/composables/useStartNavi.ts
+++ b/src/composables/useStartNavi.ts
@@ -16,7 +16,7 @@ export const useStartNavi = (shop: Ref, device: Ref, setPauseRefFn
startNavi(shop.value)
onBeforeUnmount(() => {
- window.Map_QM.showFloor(device.value.floorOrder)
+ window.Map_QM.showFloor(6)
})
//导航动画
diff --git a/src/http/api/parking/index.ts b/src/http/api/parking/index.ts
index 5524359..8c5ee9a 100644
--- a/src/http/api/parking/index.ts
+++ b/src/http/api/parking/index.ts
@@ -3,6 +3,10 @@ import { getPrefixUrl } from '../../http'
import { PREFIX } from '@/enums'
//找车
export const getFindCar = (license: string) =>
- request({ url: `${getPrefixUrl().interfaceUrl}/ThirdPark/GetPlaceInfo?carCode=${license}` })
+ request({ url: `${getPrefixUrl().interfaceUrl}/api/guide/v1/web/thirdParkRevision?plateId=${license}` })
-export const getParkingInfo = () => request({ url: `${PREFIX.STATIC_URL}/JSON/getParkingInfo.json` })
+// 获取停车场信息
+export const getParkInfo = () => request({ url: `${PREFIX.STATIC_URL}/JSON/getParkInfo.json` })
+
+// 获取停车场二维码
+export const getParkingQrList = () => request({ url: `${PREFIX.STATIC_URL}/JSON/getParkingQrList.json` })
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index e0e97b3..8dbabb9 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -8,6 +8,7 @@
"play": "Play",
"speedUp": "Speed up",
"stopSpeedUp": "Stop acceleration",
+ "searchCar": "Result",
"header": {
"recommend": "Recommend"
},
diff --git a/src/i18n/lang/zh.json b/src/i18n/lang/zh.json
index ef13bc6..87cbfc7 100644
--- a/src/i18n/lang/zh.json
+++ b/src/i18n/lang/zh.json
@@ -8,6 +8,7 @@
"play": "播放",
"speedUp": "加速",
"stopSpeedUp": "停止加速",
+ "searchCar": "车位号搜索结果",
"header": {
"recommend": "餐饮推荐"
},
diff --git a/src/store/root/actions.ts b/src/store/root/actions.ts
index 683da31..4ea2444 100644
--- a/src/store/root/actions.ts
+++ b/src/store/root/actions.ts
@@ -24,6 +24,7 @@ export interface Actions {
SET_IS4K(flag: boolean): void
SET_SHOP_MAP(shopMap: ShopMap): void
SET_ART_PLACE_LIST(list: ArtPlace[]): void
+ SET_MAP_PARK_LIST(list: string[]): void
}
export type GenActions = CreateActions
@@ -88,5 +89,8 @@ export const actions: GenActions = {
},
SET_ART_PLACE_LIST(list) {
this.artPlaceList = list
+ },
+ SET_MAP_PARK_LIST(list) {
+ this.mapParkList = list
}
}
diff --git a/src/store/root/state.ts b/src/store/root/state.ts
index 52fc0f9..d1f8a27 100644
--- a/src/store/root/state.ts
+++ b/src/store/root/state.ts
@@ -20,6 +20,7 @@ export interface State {
is4K: boolean //是否4K
shopMap: ShopMap // 店铺code与店铺信息集合
artPlaceList: ArtPlace[] // 艺术装置集合
+ mapParkList: string[] // 停车位列表
}
export const state = (): State => ({
@@ -41,5 +42,6 @@ export const state = (): State => ({
showColumnList: false,
is4K: true,
shopMap: {} as ShopMap,
- artPlaceList: []
+ artPlaceList: [],
+ mapParkList: []
})
diff --git a/src/types/map.d.ts b/src/types/map.d.ts
index 4f7e8da..aa806f3 100644
--- a/src/types/map.d.ts
+++ b/src/types/map.d.ts
@@ -33,6 +33,7 @@ export declare global {
// 地图工具对象
util: {
options: { playSpeed: number }
+ allMap: any
changePlaySpeed(speed: number = 6): void
}
// render 对象
diff --git a/src/types/parkingInfo.d.ts b/src/types/parkingInfo.d.ts
index a6d5967..de97094 100644
--- a/src/types/parkingInfo.d.ts
+++ b/src/types/parkingInfo.d.ts
@@ -1,8 +1,11 @@
declare interface ParkingInfo {
+ id: number
title: string
- titleEn: string
- content: string
- contentEn: string
- fileList: string[]
- qrFileList: Array<{ name: string; nameEn: string; fileUrl: string }>
+ content: {
+ name: string
+ nameEn: string
+ content: string
+ contentEn: string
+ file_code: string[]
+ }
}
diff --git a/src/views/Art/Art.vue b/src/views/Art/Art.vue
index 89d118e..92405f5 100644
--- a/src/views/Art/Art.vue
+++ b/src/views/Art/Art.vue
@@ -1,15 +1,17 @@
-
-
-
艺术装置
- ARTWORK
-
-
+
-
+
+
+
+
+
-
- 艺术装置
+ ARTWORK
+
+
-
+