From d358c4a7c7dc50b60f43b4c034937807e86e44c7 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Fri, 9 Jun 2023 15:17:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=AE=BE=E6=96=BD=E5=8F=AF=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=91=A8=E8=BE=B9=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=AE=AD=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/qm/MainMap_QM.js | 5 ++- src/assets/images/arround/arrow.svg | 44 +++++++++++++++++++ src/components/GuideFloors/GuideFloors.vue | 2 +- src/components/Traffic/Traffic.vue | 7 ++++ src/views/Guide/Guide.vue | 49 +++++++++++++++++----- 5 files changed, 94 insertions(+), 13 deletions(-) create mode 100644 src/assets/images/arround/arrow.svg diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index c25a3eb..c2dfc40 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -5893,7 +5893,7 @@ FindPath_QM.prototype.drawPath = function (floorOrder) { } } //this.lineDashed.name = 'lineDash' - this.lineDashed_old = new PathLine(12, linePath, parseInt(Map_QM.util.buildHeight) + 1, 'rgb(169,181,211)', 'rgb(189, 192, 203)', true) + this.lineDashed_old = new PathLine(12, linePath, parseInt(Map_QM.util.buildHeight) + 1, 'rgb(110, 149, 254)', 'rgb(110,125,254)', true) this.lineDashed_old.renderOrder = 128 Map_QM.mapArr[Map_QM.util.selectBuild][floorOrder].allObj.add(this.lineDashed_old) @@ -6012,7 +6012,7 @@ FindPath_QM.prototype.playMoveGuide = function () { Map_QM.guide.position.x = px; Map_QM.guide.position.y = py; Map_QM.moveCameraBy2D({ x: px, y: -1 * py }); - _selfFindPath.updateDrawPath() //实时绘制有效路径 await 修是 promise + //_selfFindPath.updateDrawPath() //实时绘制有效路径 await 修是 promise } if (_selfFindPath.pathPlay.isPlay && Map_QM.guide) { @@ -6038,3 +6038,4 @@ FindPath_QM.prototype.playMoveGuide = function () { } + diff --git a/src/assets/images/arround/arrow.svg b/src/assets/images/arround/arrow.svg new file mode 100644 index 0000000..c3abf45 --- /dev/null +++ b/src/assets/images/arround/arrow.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/GuideFloors/GuideFloors.vue b/src/components/GuideFloors/GuideFloors.vue index 749bf71..a49c250 100644 --- a/src/components/GuideFloors/GuideFloors.vue +++ b/src/components/GuideFloors/GuideFloors.vue @@ -95,7 +95,7 @@ defineExpose({ diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue index 5ffe795..e498417 100644 --- a/src/views/Guide/Guide.vue +++ b/src/views/Guide/Guide.vue @@ -31,12 +31,29 @@ -
-
- -

+ +
+
+ +

+
-
+ +
() import Brand from '@/utils/Class/Brand' @@ -187,6 +205,11 @@ onMounted(() => { floorMapCode: '' }) } + nextTick(() => { + if (facScroll.value) { + facScroll.value.scrollToElement('.fac-last', 30) + } + }) }) onBeforeUnmount(() => { window.Map_QM.removeEventListener('icon', onClickMapIcon) @@ -253,14 +276,20 @@ watch(mapStatus, newValue => { } } } - .fac-list { + .fac-scroll { position: absolute; top: 881px; - left: 590px; + right: 564px; z-index: 1; + overflow: hidden; + width: 1170px; + } + .fac-list { display: flex; - justify-content: flex-start; + justify-content: flex-end; + width: fit-content; .fac-item { + flex-shrink: 0; width: 44px; margin-right: 16px; font-size: 10px; @@ -282,7 +311,7 @@ watch(mapStatus, newValue => { .map-btns-list { position: absolute; top: 881px; - left: 421px; + left: 38px; z-index: 2; display: flex; .map-btn { From f2c016c99a48e95a07b3cbd198a282fe61ba8eca Mon Sep 17 00:00:00 2001 From: zhangyao Date: Fri, 9 Jun 2023 15:18:00 +0800 Subject: [PATCH 2/2] chore(release): 1.1.0-B.6 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edf5828..b1069cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ 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.1.0-B.6](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.5...v1.1.0-B.6) (2023-06-09) + + +### Features + +* 🚀 修改公共设施可滑动，修改周边增加箭头 ([d358c4a](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d358c4a7c7dc50b60f43b4c034937807e86e44c7)) + ## [1.1.0-B.5](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.4...v1.1.0-B.5) (2023-06-08) diff --git a/package-lock.json b/package-lock.json index 52cff13..708c382 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.1.0-B.5", + "version": "1.1.0-B.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.1.0-B.5", + "version": "1.1.0-B.6", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 20902d9..60d7de1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.1.0-B.5", + "version": "1.1.0-B.6", "private": true, "scripts": { "serve": "vue-cli-service serve",