Browse Source

Merge branch 'dev' of company:project-shenyangk11/sy_k11_H_base_daoshi_vue_ts into dev

pull/2/head
deepblues 3 years ago
parent
commit
45b1ae3e06
  1. 2
      public/static/offline/JSON/GetDevCoordinateByIP.json
  2. 2
      public/static/offline/JSON/config.json
  3. 139
      public/static/offline/JSON/getArtList.json
  4. 2
      public/static/offline/JSON/getBackTime.json
  5. 2
      public/static/offline/JSON/getBrandShopList.json
  6. 2
      public/static/offline/JSON/getFacilityList.json
  7. 2
      public/static/offline/JSON/getModuleList.json
  8. 2
      public/static/qm/MainMap_QM.js
  9. 4
      src/components/CarInfo/CarInfo.vue
  10. 2
      src/components/EffectFade/EffectFade.vue
  11. 5
      src/components/Search/Hot.vue
  12. 16
      src/components/Search/Result.vue
  13. 2
      src/components/ShopDetail/ShopDetail.vue
  14. 2
      src/components/ShopItem/ShopItem.vue
  15. 64
      src/components/Traffic/Traffic.vue
  16. 2
      src/components/TypeBtnList/TypeBtnList.vue
  17. 3
      src/composables/useFindCar.ts
  18. 8
      src/http/api/parking/index.ts
  19. 8
      src/types/car.d.ts
  20. 1
      src/views/Art/ArtMapItem.vue
  21. 1
      src/views/Art/ArtRightItem.vue
  22. 1
      src/views/Brand/Brand.vue
  23. 12
      src/views/Guide/Guide.vue
  24. 4
      src/views/Nav/Nav.vue
  25. 6
      src/views/Parking/Parking.vue

2
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":3,"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":0,"ip":"192.168.1.209","mac":"4CEDFBCAFF27","location":"0","angle":"0","projectCode":"project-n-ww5jvpwnu0ads70lbkda"}}

2
public/static/offline/JSON/config.json

@ -1 +1 @@
{"code":200,"msg":"操作成功","data":{"sourceUrl":"/static/offline","debug":false,"interfaceUrl":"https://project-iot.test.1000my.com/api","mobileNav":"https://1000my.obs.cn-east-2.myhuaweicloud.com/mobileqmgo/index.html#/","handWriteUrl":"http://saas.1000my.com:8014/words","fileUrl":"https://test-598d.obs.cn-east-2.myhuaweicloud.com","backSocket":"ws://127.0.0.1:7181","clickUploadUrl":"/analysis/v1/web/deviceUseClickDataUpload"}}
{"code":200,"msg":"操作成功","data":{"sourceUrl":"/static/offline","debug":false,"interfaceUrl":"https://project-iot.test.1000my.com/api","mobileNav":"https://1000my.obs.cn-east-2.myhuaweicloud.com/mobileqmgo/index.html#/","handWriteUrl":"http://saas.1000my.com:8014/words","fileUrl":"https://test-598d.obs.cn-east-2.myhuaweicloud.com","backSocket":"ws://127.0.0.1:7181","clickUploadUrl":"/analysis/v1/web/deviceUseClickDataUpload"}}

139
public/static/offline/JSON/getArtList.json

@ -1,138 +1 @@
{
"code": 200,
"msg": "操作成功",
"data": [
{
"fileCode": "U7L-31evFSZcHT-Cx_afU",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/U7L-31evFSZcHT-Cx_afU.jpg",
"flag": 2,
"artType": 2
},
{
"fileCode": "8eaU9Xr1gng_VA_J93wY4",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/8eaU9Xr1gng_VA_J93wY4.jpg",
"flag": 2,
"artType": 2
},
{
"fileCode": "waeW0L9rBMK2cgKfYq9p6",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/waeW0L9rBMK2cgKfYq9p6.jpg",
"flag": 2,
"artType": 2
},
{
"fileCode": "XWzK3bNnd4G7ZqvP3jKVC",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/XWzK3bNnd4G7ZqvP3jKVC.png",
"flag": 1,
"artType": 2
},
{
"fileCode": "wmDoGzz91VdkWXk21w3vc",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/wmDoGzz91VdkWXk21w3vc.png",
"flag": 1,
"artType": 2
},
{
"fileCode": "Tbbv6-r31zJ-nb_IwuCni",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/Tbbv6-r31zJ-nb_IwuCni.png",
"flag": 2,
"artType": 4
},
{
"fileCode": "rKqs6tfSx-YE9mVRs6jRH",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/rKqs6tfSx-YE9mVRs6jRH.png",
"flag": 1,
"artType": 4
},
{
"fileCode": "WeRFpcfjtc6se7VVlulv9",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/WeRFpcfjtc6se7VVlulv9.png",
"flag": 1,
"artType": 4
},
{
"fileCode": "9BB20uH7LsAUCs9G5bLn1",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/9BB20uH7LsAUCs9G5bLn1.jpeg",
"flag": 1,
"artType": 1
},
{
"fileCode": "xyU-DUq-t_RrrDIuzsVaA",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/xyU-DUq-t_RrrDIuzsVaA.png",
"flag": 2,
"artType": 1
},
{
"fileCode": "sp9psNqTdHdvB_Hrjkoi_",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/sp9psNqTdHdvB_Hrjkoi_.png",
"flag": 1,
"artType": 1
},
{
"fileCode": "PDUU-eWClnBaf75GvkLtl",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230505/PDUU-eWClnBaf75GvkLtl.png",
"flag": 1,
"artType": 3
},
{
"fileCode": "Gb1NiXqSAxQkdd2izaPJO",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/Gb1NiXqSAxQkdd2izaPJO.png",
"flag": 2,
"artType": 1
},
{
"fileCode": "Fmk6kcf07YcAJp7sw2ZQb",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/Fmk6kcf07YcAJp7sw2ZQb.png",
"flag": 2,
"artType": 1
},
{
"fileCode": "4oeWRq44Yib1ZLJv--7XX",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/4oeWRq44Yib1ZLJv--7XX.png",
"flag": 2,
"artType": 1
},
{
"fileCode": "WO3JKVPWJ_y82uNR-p2nA",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/WO3JKVPWJ_y82uNR-p2nA.png",
"flag": 2,
"artType": 1
},
{
"fileCode": "MRSnm9ILLTcU5R_ILNipY",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/MRSnm9ILLTcU5R_ILNipY.png",
"flag": 2,
"artType": 1
},
{
"fileCode": "KtAw80_3z8nCffxts0eGB",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/KtAw80_3z8nCffxts0eGB.png",
"flag": 2,
"artType": 1
},
{
"fileCode": "Z-KsfCiytrn3_5cj__5KY",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/Z-KsfCiytrn3_5cj__5KY.png",
"flag": 2,
"artType": 1
},
{
"fileCode": "Hve3AxoPDuLx42ObwtW76",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/Hve3AxoPDuLx42ObwtW76.png",
"flag": 2,
"artType": 2
},
{
"fileCode": "u-LrcbOriATjX4QeX2FJq",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/u-LrcbOriATjX4QeX2FJq.png",
"flag": 1,
"artType": 2
},
{
"fileCode": "PMUBs8-cvNM9FqzO1Ozyx",
"fileUrl": "/iotFile/project-bffju2pfalsylhcfcuzgaa/20230506/PMUBs8-cvNM9FqzO1Ozyx.png",
"flag": 1,
"artType": 2
}
]
}
{"code":200,"msg":"操作成功","data":[{"fileCode":"jA2-kvdFAMBJSydN25BEg","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/jA2-kvdFAMBJSydN25BEg.jpg","flag":1,"artType":1},{"fileCode":"5pQeWHTN9dRlXIyuE8Sqr","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg","flag":1,"artType":1},{"fileCode":"_WcayletIXukHgV9Rx3Ya","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg","flag":1,"artType":1},{"fileCode":"Ira19CENuPgm4Ikktgzci","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Ira19CENuPgm4Ikktgzci.jpg","flag":1,"artType":1},{"fileCode":"tlONBF4aAXF9VdKIJ2ri3","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/tlONBF4aAXF9VdKIJ2ri3.jpg","flag":1,"artType":1},{"fileCode":"Rb8lH7lciGt1vNUZIdgQe","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Rb8lH7lciGt1vNUZIdgQe.jpg","flag":2,"artType":1},{"fileCode":"IAERcSDTLeuyCxIWX5YN1","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/IAERcSDTLeuyCxIWX5YN1.jpg","flag":2,"artType":1},{"fileCode":"s3pMCKIacVBF3rNS-_W62","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/s3pMCKIacVBF3rNS-_W62.jpg","flag":2,"artType":1},{"fileCode":"eNhVVNUBgSJxM_MxsKbML","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/eNhVVNUBgSJxM_MxsKbML.jpg","flag":2,"artType":1},{"fileCode":"fsOn2GiMRQ_hvnWiVBXsV","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/fsOn2GiMRQ_hvnWiVBXsV.jpg","flag":2,"artType":1},{"fileCode":"H40UUmExfcFpebA2i-Bk6","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/H40UUmExfcFpebA2i-Bk6.jpg","flag":1,"artType":1},{"fileCode":"JfQC8KoD1vGInd2YXOQSl","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/JfQC8KoD1vGInd2YXOQSl.jpg","flag":2,"artType":2},{"fileCode":"yFB0w-HGSiAH3mF3S9VNi","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/yFB0w-HGSiAH3mF3S9VNi.jpg","flag":2,"artType":2},{"fileCode":"IbQ0bamzhOEixOQwuP_Rc","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/IbQ0bamzhOEixOQwuP_Rc.jpg","flag":2,"artType":2},{"fileCode":"nUm7hTA1R8Kg5IfaZm2BY","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/nUm7hTA1R8Kg5IfaZm2BY.jpg","flag":2,"artType":2},{"fileCode":"5NkXmpBZ9s-wYh9BDmOFF","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5NkXmpBZ9s-wYh9BDmOFF.jpg","flag":2,"artType":2},{"fileCode":"7EYcvZzHZYODEg97WTCp7","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/7EYcvZzHZYODEg97WTCp7.jpg","flag":1,"artType":2},{"fileCode":"LpAEW1Lvc3BLdNJ6XHbc_","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/LpAEW1Lvc3BLdNJ6XHbc_.jpg","flag":1,"artType":2},{"fileCode":"sLED3A_AYzulI-IF9m-b3","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/sLED3A_AYzulI-IF9m-b3.jpg","flag":1,"artType":2},{"fileCode":"QaZFHo6mTlLHvOJGPKl2C","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/QaZFHo6mTlLHvOJGPKl2C.jpg","flag":1,"artType":2},{"fileCode":"7eJGjEg08DyDG1GQuEZHS","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/7eJGjEg08DyDG1GQuEZHS.jpg","flag":1,"artType":2},{"fileCode":"G97GPxe7KT-TMvcre2lnx","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/G97GPxe7KT-TMvcre2lnx.jpg","flag":2,"artType":3},{"fileCode":"hzSAiHPb56KAecI8nVCPo","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/hzSAiHPb56KAecI8nVCPo.jpg","flag":2,"artType":3},{"fileCode":"ZK0pAC8PdhwGBnynVxRgo","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/ZK0pAC8PdhwGBnynVxRgo.jpg","flag":2,"artType":3},{"fileCode":"hi4XfhlASneBc0MX2svS2","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/hi4XfhlASneBc0MX2svS2.jpg","flag":1,"artType":3},{"fileCode":"ABTnGXm0pP9FNPngvDRaU","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/ABTnGXm0pP9FNPngvDRaU.jpg","flag":1,"artType":3},{"fileCode":"aszyTxdOZzNTNxz5nJwNk","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/aszyTxdOZzNTNxz5nJwNk.jpg","flag":1,"artType":3},{"fileCode":"bkvvG13h76NVlUqNayhFE","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/bkvvG13h76NVlUqNayhFE.jpg","flag":1,"artType":3},{"fileCode":"4AFl7ggDnt56Xa1Adphl9","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/4AFl7ggDnt56Xa1Adphl9.jpg","flag":2,"artType":3},{"fileCode":"3Uh28D-mldlpsgQglStQ_","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/3Uh28D-mldlpsgQglStQ_.png","flag":2,"artType":4},{"fileCode":"Fh3-6ToyKkizMA5HCB04P","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Fh3-6ToyKkizMA5HCB04P.png","flag":2,"artType":4},{"fileCode":"iWIiFMC6V35LjoZocZqWZ","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/iWIiFMC6V35LjoZocZqWZ.png","flag":1,"artType":4},{"fileCode":"pc-DdL_2pDm_3rk9Fo-R5","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/pc-DdL_2pDm_3rk9Fo-R5.png","flag":1,"artType":4}]}

2
public/static/offline/JSON/getBackTime.json

@ -1 +1 @@
{"code":200,"msg":"操作成功","data":[60,60]}
{"code":200,"msg":"操作成功","data":[60,60]}

2
public/static/offline/JSON/getBrandShopList.json

File diff suppressed because one or more lines are too long

2
public/static/offline/JSON/getFacilityList.json

@ -1 +1 @@
{"code":200,"msg":"操作成功","data":[]}
{"code":200,"msg":"操作成功","data":[]}

2
public/static/offline/JSON/getModuleList.json

@ -1 +1 @@
{"code":200,"msg":"操作成功","data":[{"moduleName":"店铺导航","status":0},{"moduleName":"优惠与活动","status":0},{"moduleName":"会员专享","status":1},{"moduleName":"服务","status":0},{"moduleName":"停车与缴费","status":0},{"moduleName":"文化学院","status":0},{"moduleName":"艺术","status":0}]}
{"code":200,"msg":"操作成功","data":[{"moduleName":"店铺导航","status":0},{"moduleName":"优惠与活动","status":0},{"moduleName":"会员专享","status":0},{"moduleName":"服务","status":0},{"moduleName":"停车与缴费","status":0},{"moduleName":"文化学院","status":0},{"moduleName":"艺术","status":0}]}

2
public/static/qm/MainMap_QM.js

@ -1,4 +1,4 @@
var Map_QM, renderFrame = -1, pathCameraState, stats, isJUZ = false, dir=false, iot = false, shopTime, debug = false; //dir--自定义地图大小适应不同版本的地图大小
var Map_QM, renderFrame = -1, pathCameraState, stats, isJUZ = false, dir=false, iot = true, shopTime, debug = false; //dir--自定义地图大小适应不同版本的地图大小
//basePath 基础路径 graphPath最佳路径 ftPath 扶梯路径 dtPath 电梯路径
var typeObj = [{ ft: 0, type: 0, code: 'ft', name: '扶梯' }, { upft: 1, type: 1, code: 'upft', name: '上扶梯' }, { downft: 2, type: 2, code: 'downft', name: '下扶梯' }, { mys: 3, type: 3, code: 'mys', name: '母婴室' }, { xsj: 4, type: 4, code: 'xsj', name: '洗手间' }, { dt: 5, type: 5, code: 'dt', name: '直梯' }, { hxkj: 6, type: 6, code: 'hxkj', name: '焕醒空间' },

4
src/components/CarInfo/CarInfo.vue

@ -79,7 +79,7 @@ function go() {
<style lang="scss" scoped>
.car-info-wrapper {
position: fixed;
z-index: 20;
z-index: 1001;
background: rgb(0 0 0 / 50%);
inset: 0;
@ -107,6 +107,7 @@ function go() {
.car-img {
width: 717px;
height: 403px;
border-radius: 16px 16px 0 0;
}
.car {
display: flex;
@ -123,6 +124,7 @@ function go() {
.tip {
padding-bottom: 16px;
font-size: 20px;
font-family: 'font_regulars';
color: #736661;
line-height: 28px;
}

2
src/components/EffectFade/EffectFade.vue

@ -26,7 +26,7 @@ SwiperCore.use([Autoplay, EffectFade, Pagination])
type Props = {
list: string[]
pagination: boolean
pagination?: boolean
}
withDefaults(defineProps<Props>(), {

5
src/components/Search/Hot.vue

@ -5,7 +5,7 @@
<div class="shop_list">
<div v-for="item in list" :key="item.shopCode" class="shop_item" @click="show(item)">
<div class="top">
<img v-lazy="item.logoUrl" alt="" />
<img :src="item.logoUrl" alt="" />
</div>
<div class="info">
<div class="name">{{ switchLanguage(item, 'shopName') }}</div>
@ -102,6 +102,9 @@ function show(item: any) {
margin-right: 6px;
}
.hose_num {
@include no-wrap;
max-width: 100px;
font-size: 14px;
font-family: 'font_bold';
color: #a6976f;

16
src/components/Search/Result.vue

@ -4,7 +4,7 @@
<div class="shop_list">
<div v-for="item in list" :key="item.shopCode" class="shop_item" @click="show(item)">
<div class="left">
<img v-lazy="item.logoUrl" alt="" />
<img :src="item.logoUrl" alt="" />
</div>
<div class="info">
<div class="name">{{ switchLanguage(item, 'shopName') }}</div>
@ -49,7 +49,7 @@ function show(item: Shop) {
}
.shop_list {
display: grid;
gap: 32px 150px;
gap: 32px 120px;
grid-template-columns: 1fr 1fr;
padding-bottom: 10px;
.shop_item {
@ -62,22 +62,23 @@ function show(item: Shop) {
width: 80px;
height: 80px;
padding: 8px;
margin-right: 16px;
background: #fff;
border: 1px solid rgb(155 140 133 / 50%);
border-radius: 4px;
img {
width: 64px;
height: 64px;
width: 62px;
height: 62px;
}
}
.info {
width: 120px;
width: 140px;
height: 60px;
.name {
@include no-wrap;
width: 120px;
width: 140px;
height: 32px;
margin-bottom: 6px;
font-size: 24px;
@ -95,6 +96,9 @@ function show(item: Shop) {
margin-right: 4px;
}
.hose_num {
@include no-wrap;
max-width: 120px;
font-size: 14px;
font-family: 'font_bold';
color: #9b8c85;

2
src/components/ShopDetail/ShopDetail.vue

@ -100,7 +100,7 @@ import marquees from '@/base/Marquees/Marquees.vue'
import { ref } from 'vue'
import { useRouter } from 'vue-router'
import { useStatistics } from '@/composables/useStatistics'
import { getBrandStar, setBrandStar } from '@/http/api/brand/index'
import { setBrandStar } from '@/http/api/brand/index'
import { storeToRefs } from 'pinia'
import { useRootStore } from '@/store/root'

2
src/components/ShopItem/ShopItem.vue

@ -24,7 +24,7 @@
</template>
<script setup lang="ts">
const props = defineProps<{ shop: Shop }>()
defineProps<{ shop: Shop }>()
</script>
<style scoped lang="scss">

64
src/components/Traffic/Traffic.vue

@ -128,7 +128,12 @@
</template>
<script setup lang="ts">
import { ref } from 'vue'
import { ref, toRefs } from 'vue'
import { getThirdTraffic } from '@/http/api/parking'
import { useRootStore } from '@/store/root'
import { HTTP_CODE } from '@/enums'
const store = useRootStore()
const { device } = toRefs(store)
const statusList = [
{
@ -212,43 +217,30 @@ const roadList = ref([
}
])
const resList = [
{
roadName: '九龙街',
sectionDesc: '南向北',
status: '拥堵',
speed: 21.37,
distance: 740
},
{
roadName: '青年大街',
sectionDesc: '南向北',
status: '拥堵',
speed: 21.38,
distance: 730
}
]
getThirdTraffic(device.value.projectCode).then(res => {
if (res.code === HTTP_CODE.ERR_OK) {
res.data.forEach(item => {
switch (item.roadName) {
case '沈水路':
item.sectionDesc === '东向西' ? changeStatus(item.status, roadList.value[0]) : changeStatus(item.status, roadList.value[1])
break
case '九龙街':
if (item.sectionDesc === '南向北' || item.sectionDesc === '东向西') {
changeStatus(item.status, roadList.value[2])
changeStatus(item.status, roadList.value[4])
} else {
changeStatus(item.status, roadList.value[3])
changeStatus(item.status, roadList.value[5])
}
break
case '青年大街':
item.sectionDesc === '南向北' ? changeStatus(item.status, roadList.value[6]) : changeStatus(item.status, roadList.value[7])
break
resList.forEach(item => {
switch (item.roadName) {
case '沈水路':
item.sectionDesc === '东向西' ? changeStatus(item.status, roadList.value[0]) : changeStatus(item.status, roadList.value[1])
break
case '九龙街':
if (item.sectionDesc === '南向北' || item.sectionDesc === '东向西') {
changeStatus(item.status, roadList.value[2])
changeStatus(item.status, roadList.value[4])
} else {
changeStatus(item.status, roadList.value[3])
changeStatus(item.status, roadList.value[5])
default:
break
}
break
case '青年大街':
item.sectionDesc === '南向北' ? changeStatus(item.status, roadList.value[6]) : changeStatus(item.status, roadList.value[7])
break
default:
break
})
}
})

2
src/components/TypeBtnList/TypeBtnList.vue

@ -25,7 +25,7 @@ type TypeItem = {
title: string
titleEn: string
}
const props = defineProps<{
defineProps<{
list: TypeItem[]
}>()

3
src/composables/useFindCar.ts

@ -41,8 +41,7 @@ export const useFindCar = () => {
return
}
const info = window.Map_QM.pathPark({ shopNum: plate })
if (info?.node?.length) {
if (info?.node) {
const floor: any = store.buildingList[0].floorList.find(item => item.floorOrder === info.floor)?.floor
const shop = {
shopCode: '',

8
src/http/api/parking/index.ts

@ -1,5 +1,9 @@
import { request } from '../../http'
//找车
export const getFindCar = (license: string) => request<CarInfo>({ url: `/ThirdPark/GetPlaceInfo?carCode=${license}` })
// 找车
export const getFindCar = (plateId: string) => request<CarInfo>({ url: `/v1/web/thirdPark`, data: { plateId }, method: 'post' })
// 周边交通
export const getThirdTraffic = (projectCode: string) =>
request<Traffic[]>({ url: `/v1/web/thirdTraffic`, params: { projectCode }, method: 'get' })
export const getParkingInfo = () => request<ParkingInfo>({ url: `/JSON/getParkingInfo.json` })

8
src/types/car.d.ts

@ -9,3 +9,11 @@ declare interface CarInfo {
parkingTime: string // 停车时长
spaceNo: string //车位号
}
declare interface Traffic {
roadName: string
sectionDesc: string
status: string
speed: number
distance: number
}

1
src/views/Art/ArtMapItem.vue

@ -28,6 +28,7 @@ const emits = defineEmits(['go'])
const props = defineProps({
artInfo: {
type: Object,
// eslint-disable-next-line @typescript-eslint/no-empty-function, no-empty-function
default: () => {}
}
})

1
src/views/Art/ArtRightItem.vue

@ -24,6 +24,7 @@ const emits = defineEmits(['go'])
const props = defineProps({
artInfo: {
type: Object,
// eslint-disable-next-line @typescript-eslint/no-empty-function, no-empty-function
default: () => {}
}
})

1
src/views/Brand/Brand.vue

@ -240,6 +240,7 @@ function clickShop(item: Shop) {
position: absolute;
top: 319px;
left: 124px;
width: 144px;
font-size: 24px;
font-family: 'font_bold';
text-align: center;

12
src/views/Guide/Guide.vue

@ -3,11 +3,11 @@
</template>
<script setup lang="ts">
import { useGuideMapOperation } from '@/composables/useGuideMapOperation'
import { useFacilityNav } from '@/composables/useFacilityNav'
import { useGuideFilterShop } from '@/composables/useGuideFilterShop'
// import { useGuideMapOperation } from '@/composables/useGuideMapOperation'
// import { useFacilityNav } from '@/composables/useFacilityNav'
// import { useGuideFilterShop } from '@/composables/useGuideFilterShop'
const { floorIdx, selectedShopList, filterShopByFloorName, filterAboutCurrentInfo } = useGuideFilterShop() //
const { switchFloor, handleMapIcon, list, mapIdx } = useGuideMapOperation() //
const { handleFacility } = useFacilityNav() //
// const { floorIdx, selectedShopList, filterShopByFloorName, filterAboutCurrentInfo } = useGuideFilterShop() //
// const { switchFloor, handleMapIcon, list, mapIdx } = useGuideMapOperation() //
// const { handleFacility } = useFacilityNav() //
</script>

4
src/views/Nav/Nav.vue

@ -168,10 +168,10 @@ import ScrollView from '@/base/ScrollView/ScrollView.vue'
const store = useRootStore()
const { shop, device, language, config } = storeToRefs(store)
const { replay, pause, speedUp, handleReplay, togglePause, handleSpeedUp, resetPause } = useMapNavControl()
const { speedUp, handleReplay, handleSpeedUp, resetPause } = useMapNavControl()
const { directionInfo, pathShopList, backPathArray, startNavi } = useStartNavi(shop, device, resetPause)
const { methodIdx, methodsList, handleControl } = useChangeNavMethod(backPathArray)
const { cameraViews, setCameraViews } = useSetCameraViews(resetPause)
const { cameraViews } = useSetCameraViews(resetPause)
const isBack = ref(false)

6
src/views/Parking/Parking.vue

@ -80,8 +80,12 @@ const { del, handleKeyboard, handleEnergy, inputLength, plate, plateToString, se
const { confirm, loading, showCarDetail, result } = useFindCar()
function onConfirm() {
plate.value = LICENSE
confirm(plateToString.value, tabIdx.value)
if (tabIdx.value === 0) {
plate.value = LICENSE
} else {
plate.value = []
}
}
const parkingInfo = shallowRef<ParkingInfo>({} as ParkingInfo)

Loading…
Cancel
Save