Merge branch 'dev' of git.1000my.com:project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts into dev

3 years ago · b6aba5ba7b
19 changed files with 169 additions and 46 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,42 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+## [1.0.0-B.5](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.4...v1.0.0-B.5) (2023-07-20)
+
+
+### Bug Fixes
+
+* 🧩 相关优化 ([3124473](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/3124473236a30e48f03c1bffa1222cdd8a47d5ec))
+
+## [1.0.0-B.4](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.3...v1.0.0-B.4) (2023-07-20)
+
+
+### Bug Fixes
+
+* 🧩 相关优化 ([70e1361](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/70e1361dfb59a70d7d6627aeda4178fb018d05be))
+
+## [1.0.0-B.3](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.2...v1.0.0-B.3) (2023-07-20)
+
+
+### Bug Fixes
+
+* 🧩 停车优化 ([64c971d](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/64c971dca902d4dc393114d71513e81374fefa19))
+
+## [1.0.0-B.2](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.1...v1.0.0-B.2) (2023-07-19)
+
+
+### Features
+
+* 🚀 新增特殊业态功能 ([c017834](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/c01783411c3d10d759d1e7ced0377d470ba0addb))
+
+
+### Bug Fixes
+
+* 🧩 根据楼层修改地图位置 ([fb49958](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/fb49958c24670006c44a04610f964e2e43843899))
+* 修改服务为绑定公共设施 ([354a94d](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/354a94da27c24fdfca02cc06b51398138bfbadbb))
+* 修改搜索样式 ([cbb5c6d](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/cbb5c6d3697bea94478c132a8dc0e5773f80aa73))
+* 修改语句 ([07f0772](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/07f077253fb29ee78c165e83ed4e51691a662943))
+
 ## 1.0.0-B.1 (2023-07-18)


--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "vue_cli_ts",
-  "version": "1.0.0-B.1",
+  "version": "1.0.0-B.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "vue_cli_ts",
-      "version": "1.0.0-B.1",
+      "version": "1.0.0-B.5",
      "dependencies": {
        "@better-scroll/core": "^2.5.0",
        "@better-scroll/observe-image": "^2.5.0",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "vue_cli_ts",
-  "version": "1.0.0-B.1",
+  "version": "1.0.0-B.5",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve",
--- a/public/static/offline/JSON/getArtWorkList.json
+++ b/public/static/offline/JSON/getArtWorkList.json
@ -9,7 +9,7 @@
        "name": "猩猩的太空漫步",
        "nameEn": "dddd",
        "file_code": [
-          "/iotFile/project-ey_fpaur6s6fkgvszywana/20230713/vwcYXFrhK1CbEB6uFy76R.png"
+          "/iotFile/project-ey_fpaur6s6fkgvszywana/20230711/i5NJjQ-h_RKrWqWza7g79.jpg"
        ],
        "point": "0_3_4",
        "content": "vnasfkvl",
--- a/public/static/qm/MainMap_QM.js
+++ b/public/static/qm/MainMap_QM.js
@ -78,7 +78,7 @@ QMUtil = function () {
 	//debug 参数 相机坐标/ 镜头方向
 	this.guiOptions = { cameraX: 0, cameraY: 220, cameraZ: 220, targatX: 0, targatY: 0, targatZ: 0 }; //this.button = function() {};

-	this.sceneGap = { x: 0, y: 0, z: 0, scale: dir ? 0.15 : 0.055 };   //改变地图位置，大小
+	this.sceneGap = { x: 0, y: 0, z: 0, scale: dir ? 0.15 : 0.06 };   //改变地图位置，大小

 	this.selectBuild = 0;
 	this.selectFloor = 0;
@ -4845,7 +4845,7 @@ MainMap_QM.prototype = {
 				}

 				let zo = 2, tz = 2, boxT = 0, boxZ = 0;
-				let add = Map_QM.util.options.showStyle ? 80 : 40;
+				let add = Map_QM.util.options.showStyle ? 120 : 40;
 				Map_QM.util._indexPathFloor++;
 				let toFloor = parseInt(Map_QM.forShopArr[Map_QM.util._indexPathFloor].floor);
 				Map_QM.util.selectFloor = toFloor;
@ -4861,6 +4861,7 @@ MainMap_QM.prototype = {
 				document.getElementById('moveFloor').style.bottom = zo + "px";
 				document.getElementById('moveFloor').style.width = add + "px";
 				document.getElementById('moveFloor').style.height = add + "px";
+        document.getElementById('moveFloor').style.left = "4px";
 				Map_QM.moveFloorbg.element.style.visibility = "visible";
 				Map_QM.moveFloorbg.element.style.width = (add + 8) + "px";
 				Map_QM.moveFloorbg.element.style.height = (floorArr.length * add) + "px";
@ -5341,7 +5342,7 @@ FloorMap_QM.prototype = {
 						alphaTest: 0.1
 					});
 					let sprite = new MySprite_QM(spriteMaterial);
-					sprite.scale.set(64, 64, 1);
+					sprite.scale.set(128, 128, 1);
 					sprite.imgUrl = url;
 					sprite.center = new THREE.Vector2(0.5, 0);
 					sprite.userData = item;
@ -5544,12 +5545,7 @@ FloorMap_QM.prototype = {
 									mapData.shopArea[i].type = "promotion";
 									this.addTagLabel(mapData.shopArea[i], { "node": mapData.shopArea[i].shopNav, "floor": this.floorOrder, "build": this.buildOrder });
 								}
-								if (shopData[h].formatColor) {
-									entColor = parseInt(shopData[h].formatColor.replace("#", "0x"), 16);
-								}
-								if (shopData[h].borderColor) {
-									borderColor = parseInt(shopData[h].borderColor.replace("#", "0x"), 16);
-								}
+
 								break;
 							}
 						}
--- a/src/components/CarInfo/CarInfo.vue
+++ b/src/components/CarInfo/CarInfo.vue
@ -9,15 +9,15 @@
      <div class="car">
        <div class="car-group">
          <div class="tip">车牌号</div>
-          <div class="text">{{ carInfo.carCode }}浙B88888</div>
+          <div class="text">{{ carInfo.plateNo }}</div>
        </div>
        <div class="car-group">
          <div class="tip">车位号</div>
-          <div class="text">{{ carInfo.spaceNo }}S-B1-001-102区</div>
+          <div class="text">{{ carInfo.spaceNo }}</div>
        </div>
        <div class="car-group">
          <div class="tip">停车时长</div>
-          <div class="text">{{ carInfo.parkingTime }}1小时30分钟</div>
+          <div class="text">{{ carInfo.parkTime }}</div>
        </div>
      </div>
      <div class="close-icon" @click="close">
@ -128,12 +128,12 @@ function go() {
    }
  }
  .car {
-    flex-wrap: wrap;
    position: absolute;
-    bottom: 102px;
+    bottom: 0;
    left: 368px;
  }
  .car-group {
+    margin-bottom: 32px;
    .tip {
      padding-bottom: 16px;
      font-size: 20px;
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@ -90,9 +90,10 @@ function handleDetail() {
 <style lang="scss" scoped>
 #mapContainer {
  position: absolute;
-  right: 0;
-  width: 1432px;
-  height: 948px;
+  top: 152px;
+  right: 345px;
+  width: 1122px;
+  height: 676px;
 }
 .map-flex {
  display: flex;
@ -115,8 +116,6 @@ function handleDetail() {
    font-family: 'font_bold';
    color: #fff;
    font-weight: 700;
-
-    @include no-wrap;
  }
  .go-button {
    width: 125px;
@ -142,7 +141,7 @@ function handleDetail() {
 }
 #moveFloorBG {
  position: absolute;
-  width: 48px;
+  width: 128px;
  background-color: #fff;
  border-radius: 5px;
  visibility: hidden;
@ -150,9 +149,9 @@ function handleDetail() {
 #moveFloor {
  position: absolute;
  bottom: 2px;
-  left: 2px;
+  left: 4px;
  z-index: -1;
-  width: 48px;
+  width: 120px;
  height: 48px;
  background-color: #dbb186;
  border-radius: 5px;
--- a/src/components/PlateInput/PlateInput.vue
+++ b/src/components/PlateInput/PlateInput.vue
@ -81,7 +81,7 @@ $btn-width: 197px;
  position: relative;
  display: flex;
  justify-content: space-between;
-  width: 856px;
+  width: 872px;
  margin-bottom: 40px;
  &::before {
    position: absolute;
--- a/src/components/PlateKeyboard/PlateKeyboard.vue
+++ b/src/components/PlateKeyboard/PlateKeyboard.vue
@ -10,6 +10,7 @@
        keyboardIdx === index ? 'active' : '',
        searchMethods === '车位' ? 'space' : ''
      ]"
+      :data-key="item"
      @click="handleKeyboard(item, index)"
    >
      <svg
@ -90,8 +91,30 @@ onBeforeUnmount(() => {
      width: 24px;
      height: 24px;
    }
+
+    &[data-key='黑'],
+    &[data-key='甘'],
+    &[data-key='藏'],
+    &[data-key='警'],
+    &[data-key='F'],
+    &[data-key='M'],
+    &[data-key='T'],
+    &[data-key='Z'] {
+      margin-right: 16px;
+    }
+    &[data-key='3'],
+    &[data-key='6'],
+    &[data-key='9'] {
+      margin-right: 0;
+    }
    &.space {
      width: 88px;
+      &[data-key='F'],
+      &[data-key='M'],
+      &[data-key='T'],
+      &[data-key='Z'] {
+        margin-right: 24px;
+      }
      &.del {
        width: 184px;
      }
@ -104,6 +127,7 @@ onBeforeUnmount(() => {
      justify-content: center;
      align-items: center;
      width: 88px;
+      margin-right: 0;
      background: #fff;
      line-height: initial;
    }
--- a/src/components/PublicComponent/PublicComponent.vue
+++ b/src/components/PublicComponent/PublicComponent.vue
@ -77,6 +77,9 @@ onBeforeUnmount(() => {
 watch(route, to => {
  if (to.fullPath === '/' || to.fullPath === '/nav') {
    window?.Map_QM?.startRender()
+    if (to.fullPath === '/') {
+      window?.Map_QM?.showFloor(6)
+    }
  } else {
    window?.Map_QM?.cancelRender()
  }
--- a/src/components/Recommend/Recommend.vue
+++ b/src/components/Recommend/Recommend.vue
@ -21,7 +21,7 @@
                <div class="shopName">{{ switchLanguage(shopMap[item.content.shopCode], 'shopName') }}</div>
                <div class="number">
                  <img src="@/assets/images/art/poi.svg" alt="" />
-                  <div>{{ shopMap[item.content.shopCode].houseNumber }}</div>
+                  <div class="numbers">{{ shopMap[item.content.shopCode].houseNumber }}</div>
                </div>
              </div>
            </div>
@ -202,14 +202,16 @@ getColumnList().then(({ data }) => {
              }
              .number {
                @include fl();
-                @include no-wrap;
-
-                max-width: 80px;
                img {
                  width: 16px;
                  height: 16px;
                  margin-right: 8px;
                }
+                .numbers {
+                  @include no-wrap;
+
+                  max-width: 80px;
+                }
              }
            }
          }
--- a/src/composables/useGuideFilterShop.ts
+++ b/src/composables/useGuideFilterShop.ts
@ -14,6 +14,23 @@ export const useGuideFilterShop = () => {
    floorIdx.value = floorOrder
    selectedShopList.value = shopList.value.filter(item => item.floorOrder === floorOrder)
    hideMapDialog()
+    if (floorOrder === 6) {
+      const art: any = document.getElementById('mapContainer')
+      art.style.width = '2244px'
+      art.style.height = '1352px'
+      art.style.right = '690px'
+      art.style.top = '304px'
+      window.Map_QM.changeWindowResize(2244, 1352)
+    } else {
+      const art: any = document.getElementById('mapContainer')
+      if (art.style.width !== '2864px') {
+        art.style.width = '2864px'
+        art.style.height = '1896px'
+        art.style.right = '0'
+        art.style.top = '0'
+        window.Map_QM.changeWindowResize(2864, 1896)
+      }
+    }
    window.Map_QM.showFloor(floorOrder)
  }

@ -32,7 +49,7 @@ export const useGuideFilterShop = () => {

  // 筛选美食业态
  function changeFoodShopList() {
-    selectedShopList.value = selectedShopList.value.filter(item => {
+    selectedShopList.value = shopList.value.filter(item => {
      let flag = false
      for (let i = 0; i < specialIndustryList.value.length; i++) {
        if (specialIndustryList.value[i].content.industry_id === item.industryFatherCode) {
--- a/src/composables/useInitMap.ts
+++ b/src/composables/useInitMap.ts
@ -49,12 +49,13 @@ export const useInitMap = async function () {
 //点击地图店铺box
 function onClickShop(event: any) {
  const store = useRootStore()
-
  if (event.data) {
-    showMapDialog()
+    hideMapDialog()
    !window.shopInfo && document.getElementById('shopInfo')
    window.Map_QM.addElementLabel(window.shopInfo, event.data.xaxis, event.data.yaxis)
    store.SET_SHOP(event.data.shopData)
+    store.SET_CURRENT_ART_NAME('')
+    showMapDialog()
  }
  // else {
  //   hideMapDialog()
@ -80,6 +81,7 @@ function onClickArt(event: any) {
      logoUrl: '',
      yaxis: Number(poi[2])
    }
+    store.SET_CURRENT_ART_NAME(event.data.artData.content.name)
    store.SET_SHOP(shop)
  }
 }
--- a/src/store/root/actions.ts
+++ b/src/store/root/actions.ts
@ -26,6 +26,7 @@ export interface Actions {
  SET_ART_PLACE_LIST(list: ArtPlace[]): void
  SET_MAP_PARK_LIST(list: string[]): void
  SET_SPECIAL_LIST(list: SpecialIndustry[]): void
+  SET_CURRENT_ART_NAME(name: string): void
 }

 export type GenActions = CreateActions<Root, State, Actions>
@ -96,5 +97,8 @@ export const actions: GenActions = {
  },
  SET_SPECIAL_LIST(list) {
    this.specialIndustryList = list
+  },
+  SET_CURRENT_ART_NAME(name) {
+    this.currentArtName = name
  }
 }
--- a/src/store/root/state.ts
+++ b/src/store/root/state.ts
@ -22,6 +22,7 @@ export interface State {
  artPlaceList: ArtPlace[] // 艺术装置集合
  mapParkList: string[] // 停车位列表
  specialIndustryList: SpecialIndustry[] // 特殊业态列表
+  currentArtName: string // 当前选中艺术装置
 }

 export const state = (): State => ({
@ -45,5 +46,6 @@ export const state = (): State => ({
  shopMap: {} as ShopMap,
  artPlaceList: [],
  mapParkList: [],
-  specialIndustryList: []
+  specialIndustryList: [],
+  currentArtName: ''
 })
--- a/src/views/Art/ArtItem.vue
+++ b/src/views/Art/ArtItem.vue
@ -7,7 +7,7 @@
          <div class="title">{{ artInfo.content.name }}</div>
          <div class="titleEn">{{ artInfo.content.nameEn }}</div>
        </div>
-        <img src="@/assets/images/art/go.svg" alt="" />
+        <img src="@/assets/images/art/go.svg" alt="" @click="go(artInfo)" />
      </div>
      <ScrollView :list="switchLanguage(artInfo.content, 'content')" class="intro-scroll" scrollbar>
        <div class="intro">{{ switchLanguage(artInfo.content, 'content') }}</div>
@ -17,13 +17,35 @@
 </template>

 <script setup lang="ts">
-import ScrollView from '@/base/ScrollView/ScrollView.vue'
+import { useRouter } from 'vue-router'
 import { useSwitchLanguage } from '@/composables/useSwitchLanguage'
+import { useRootStore } from '@/store/root'
+import ScrollView from '@/base/ScrollView/ScrollView.vue'
 const { switchLanguage } = useSwitchLanguage()
+const store = useRootStore()
+const router = useRouter()
 type Prop = {
  artInfo: ArtPlace
 }
 defineProps<Prop>()
+
+// 跳转导航
+function go(item: ArtPlace) {
+  // 点位信息
+  const poi = item.content.point.split('_')
+  const floors = store.currentBuildingFloorsList.filter(item => item.floorOrder === Number(poi[1]))
+  const shop = {
+    shopCode: '',
+    shopName: item.content.name,
+    shopNameEn: item.content.nameEn,
+    floorOrder: floors[0].floorOrder,
+    floor: floors[0].floor,
+    logoUrl: item.content.icon[0],
+    yaxis: Number(poi[2])
+  }
+  store.SET_SHOP(shop)
+  router.push('/nav')
+}
 </script>

 <style lang="scss" scoped>
--- a/src/views/Guide/FloorPicList.vue
+++ b/src/views/Guide/FloorPicList.vue
@ -46,7 +46,7 @@ getFloorPicList().then(({ data }) => {
    border: 2px solid #fff;
    border-radius: 0 24px 24px 0;
    img {
-      width: 200px;
+      width: 208px;
      height: 80px;
    }
  }
--- a/src/views/Guide/Guide.vue
+++ b/src/views/Guide/Guide.vue
@ -105,7 +105,7 @@ import ArtList from './ArtList.vue'
 import FloorPicList from './FloorPicList.vue'
 const store = useRootStore()
 const { switchLanguage } = useSwitchLanguage()
-const { language, facilityList, artPlaceList } = toRefs(store)
+const { language, facilityList, artPlaceList, currentArtName } = toRefs(store)
 const { floorIdx, areaName, selectedShopList, changeFloor, changeArea, changeFoodShopList } = useGuideFilterShop() //筛选店铺
 const { handleMapIcon, list, mapIdx } = useGuideMapOperation(changeFloor, changeFoodShopList) //复位 位置等操作
 const { handleFacility } = useFacilityNav() //公共设施导航
@ -122,22 +122,21 @@ getAreaPicList().then(({ data }) => {
 function changeFloors(floorOrder: number) {
  changeFloor(floorOrder)
  mapIdx.value = -1
-  currentArtName.value = ''
+  currentArtName.value && store.SET_CURRENT_ART_NAME('')
 }

 // 切换区域
 function changeAreas(name: string) {
  changeArea(name)
  mapIdx.value = -1
-  currentArtName.value = ''
+  currentArtName.value && store.SET_CURRENT_ART_NAME('')
 }

-const currentArtName = ref('')
 // 展示艺术装置弹窗
 function show(item: ArtPlace) {
-  currentArtName.value = item.content.name
  // 点位信息
  const poi = item.content.point.split('_')
+  changeFloors(Number(poi[1]))
  hideMapDialog()
  window.Map_QM.addElementByNode(document.getElementById('artWorkInfo'), Number(poi[2]))
  const art: any = document.getElementById('artWorkInfo')
@ -150,9 +149,11 @@ function show(item: ArtPlace) {
    shopNameEn: item.content.nameEn,
    floorOrder: floors[0].floorOrder,
    floor: floors[0].floor,
-    logoUrl: '',
-    yaxis: Number(poi[2])
+    logoUrl: item.content.icon[0],
+    yaxis: Number(poi[2]),
+    doorMaterialList: item.content.file_code
  }
+  store.SET_CURRENT_ART_NAME(item.content.name)
  store.SET_SHOP(shop)
 }
 </script>
--- a/src/views/Nav/Nav.vue
+++ b/src/views/Nav/Nav.vue
@ -147,7 +147,7 @@
 </template>

 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { onUnmounted, ref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useRootStore } from '@/store/root'
 import { useMapNavControl } from '@/composables/useMapNavControl'
@ -215,6 +215,21 @@ if (showSearch.value) {
 watch(shop, newVal => {
  startNavi({ ...newVal })
 })
+
+onUnmounted(() => {
+  const art: any = document.getElementById('mapContainer')
+  art.style.width = '2244px'
+  art.style.height = '1352px'
+  art.style.right = '690px'
+  art.style.top = '304px'
+  window.Map_QM.changeWindowResize(2244, 1352)
+})
+const art: any = document.getElementById('mapContainer')
+art.style.width = '2528px'
+art.style.height = '1896px'
+art.style.right = '0'
+art.style.top = '0'
+window.Map_QM.changeWindowResize(2528, 1896)
 </script>

 <style lang="scss" scoped>