diff --git a/public/static/offline/JSON/config.json b/public/static/offline/JSON/config.json index 94c23df..655fd9f 100644 --- a/public/static/offline/JSON/config.json +++ b/public/static/offline/JSON/config.json @@ -1 +1,15 @@ -{"code":200,"msg":"操作成功","data":[{"id":265,"title":"前端配置","content":{"interfaceUrl":"https://project-iot.test.1000my.com/api","mobileNav":"https://qianmu-iot.1000my.com/test-projects/project-ey_fpaur6s6fkgvszywana/index.html#/?","handWriteUrl":"http://saas.1000my.com:8014/words"}}]} \ No newline at end of file +{ + "code": 200, + "msg": "操作成功", + "data": [ + { + "id": 265, + "title": "前端配置", + "content": { + "interfaceUrl": "http://192.168.1.137/api", + "mobileNav": "https://qianmu-iot.1000my.com/test-projects/project-ey_fpaur6s6fkgvszywana/index.html#/?", + "handWriteUrl": "http://saas.1000my.com:8014/words" + } + } + ] +} diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 6636f69..6635c62 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -1783,7 +1783,7 @@ MainMap_QM.prototype = { let floor = new FloorMap_QM(bIndex, fIndex, Map_QM.util.allMap[bIndex].buildArr[fIndex].name); floor.floorName = Map_QM.util.allMap[bIndex].buildArr[fIndex].name; floor.initDraw(); - floor.allObj.position.set(bIndex * Map_QM.util.options.bSpace, 0, 0); + //floor.allObj.position.set(bIndex * Map_QM.util.options.bSpace, 0, 0); if (fIndex != parseInt(Map_QM.util.deviceObj.floor)) { floor.allObj.visible = false; } @@ -5267,7 +5267,9 @@ FloorMap_QM = function (bIndex, fIndex, floorName) { this.floorOrder = fIndex; this.buildOrder = bIndex this.floorName = floorName; - + if(fIndex==4){ + this.allObj.position.x = -600; + } //存放设施图标 this.serObj = new THREE.Object3D(); //存放车位box diff --git a/src/App.vue b/src/App.vue index 059dc24..0aa87cb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -25,5 +25,9 @@ body, :deep(.swiper-pagination-bullet) { border-radius: 2px; } + .animate__animated { + animation-duration: 0.3s !important; + animation-duration: 0.3s !important; + } } diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 6b533e8..43011d8 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -90,10 +90,10 @@ function handleDetail() { diff --git a/src/views/Guide/FloorPicList.vue b/src/views/Guide/FloorPicList.vue index 42cdc7b..1347317 100644 --- a/src/views/Guide/FloorPicList.vue +++ b/src/views/Guide/FloorPicList.vue @@ -40,7 +40,7 @@ getFloorPicList().then(({ data }) => { diff --git a/src/views/Guide/list.ts b/src/views/Guide/list.ts index 2af54d2..eefbc58 100644 --- a/src/views/Guide/list.ts +++ b/src/views/Guide/list.ts @@ -12,12 +12,6 @@ export type Item = { } export const list: Item[] = [ - { - name: MapControl.FOOD, - nameEn: 'food', - icon: require('@/assets/images/guide/food.svg'), - iconActive: require('@/assets/images/guide/brand_active.svg') - }, { name: MapControl.RESET, nameEn: 'reset', diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue index cc399a4..8e8241b 100644 --- a/src/views/Nav/Nav.vue +++ b/src/views/Nav/Nav.vue @@ -128,9 +128,7 @@
-
- -
+
{{ switchLanguage(directionInfo, 'text') }}
{{ $t('navs.tip') }}
@@ -188,7 +186,6 @@ function back() { // 切换路线 function changeControl(name: NavMethods, index: number) { - console.log(name) pathGroupRef.value.resetPlayIdx() pathGroupRef.value.myScroll.scrollTo(0, 0, 0) handleControl(name, index) @@ -220,14 +217,6 @@ watch(shop, 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' @@ -525,10 +514,14 @@ window.Map_QM.changeWindowResize(2528, 1896) overflow: hidden; width: 132px; height: 206px; - - img { + .dir-img { width: 132px; height: 132px; + animation-duration: 1s; + animation-duration: 1s; + animation-fill-mode: both; + animation-fill-mode: both; + animation-iteration-count: infinite; } .direc-text { margin-top: 20px; diff --git a/src/views/Service/Service.vue b/src/views/Service/Service.vue index 02808e3..dc94df8 100644 --- a/src/views/Service/Service.vue +++ b/src/views/Service/Service.vue @@ -18,22 +18,18 @@ - -
    - -
+ +
+
    + +
+