diff --git a/CHANGELOG.md b/CHANGELOG.md index 7541ffd..f63332c 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.8](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.7...v1.1.0-B.8) (2023-06-16) + + +### Features + +* 🚀 修改文字遮挡问题 ([50769ea](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/50769ea9565aef0e9668c902525cc41005a43424)) + ## [1.1.0-B.7](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.6...v1.1.0-B.7) (2023-06-09) diff --git a/package-lock.json b/package-lock.json index 296aba0..265077f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.1.0-B.7", + "version": "1.1.0-B.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.1.0-B.7", + "version": "1.1.0-B.8", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index ccf1840..f741b4c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.1.0-B.7", + "version": "1.1.0-B.8", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/public/static/offline/JSON/getServeList.json b/public/static/offline/JSON/getServeList.json index 62a0fe8..147f34e 100644 --- a/public/static/offline/JSON/getServeList.json +++ b/public/static/offline/JSON/getServeList.json @@ -1 +1,77 @@ -{"code":200,"msg":"操作成功","data":{"serveList":[]}} \ No newline at end of file +{ + "code": 200, + "msg": "操作成功", + "data": { + "serveList": [ + { + "name": "母婴室拉萨酱豆腐路上看见独立房间数量大幅", + "nameEn": "muyingshi", + "logoUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/DuK2J6y7qyGJDBxpxVQS3.png", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_EMy-K7nCJOXBMEaIq6CC.png", + "qrUrl": "", + "content": "母婴室信息", + "contentEn": "muyingshi", + "isPoint": 2, + "building": "", + "buildingCode": "", + "buildingOrder": 0, + "floor": "", + "floorCode": "", + "floorOrder": 0, + "point": -1 + }, + { + "name": "体温计阿斯利康的飞机老师酱豆腐立刻撒旦解放了", + "nameEn": "tiwenj", + "logoUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/8HjKGhry5r4JGJ1Cdlo3e.png", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/YzpHFa2tq1y0Y9g92leE9.png", + "qrUrl": "", + "content": "体温计", + "contentEn": "tiwenj", + "isPoint": 2, + "building": "", + "buildingCode": "", + "buildingOrder": 0, + "floor": "", + "floorCode": "", + "floorOrder": 0, + "point": -1 + }, + { + "name": "血压计", + "nameEn": "xueyaji", + "logoUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/pUPfu0ibaBHzTdrT8OsMK.png", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/a0c-LW4BYv_YlnFvF2hor.png", + "qrUrl": "", + "content": "血压计", + "contentEn": "xueyaji", + "isPoint": 2, + "building": "", + "buildingCode": "", + "buildingOrder": 0, + "floor": "", + "floorCode": "", + "floorOrder": 0, + "point": -1 + }, + { + "name": "穿梭巴士", + "nameEn": "scbs", + "logoUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/wbQwJw3IGvaUKo1fxwqJE.png", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/XxPPvgPGDCQPqQpwmwxmx.png", + "qrUrl": "", + "content": "穿梭巴士", + "contentEn": "csbs", + "isPoint": 2, + "building": "", + "buildingCode": "", + "buildingOrder": 0, + "floor": "", + "floorCode": "", + "floorOrder": 0, + "point": -1 + } + + ] + } +} \ No newline at end of file diff --git a/src/base/Marquees/Marquees.vue b/src/base/Marquees/Marquees.vue index a4d6d21..4b503f6 100644 --- a/src/base/Marquees/Marquees.vue +++ b/src/base/Marquees/Marquees.vue @@ -1,7 +1,7 @@ diff --git a/src/composables/useMapNavControl.ts b/src/composables/useMapNavControl.ts index 0611567..6e48ce2 100644 --- a/src/composables/useMapNavControl.ts +++ b/src/composables/useMapNavControl.ts @@ -8,7 +8,7 @@ export const useMapNavControl = () => { //重播 function handleReplay() { - window.Map_QM.util.changePlaySpeed(20) + window.Map_QM.util.changePlaySpeed(13) replay.value = true pause.value = false speedUp.value = false @@ -37,7 +37,7 @@ export const useMapNavControl = () => { speedUp.value = !speedUp.value window.Map_QM.pathStop(true) nextTick(() => { - speedUp.value ? window.Map_QM.util.changePlaySpeed(25) : window.Map_QM.util.changePlaySpeed(20) + speedUp.value ? window.Map_QM.util.changePlaySpeed(16) : window.Map_QM.util.changePlaySpeed(13) }) } @@ -48,7 +48,7 @@ export const useMapNavControl = () => { onBeforeUnmount(() => { clearTimeout(replayTimer.value) replayTimer.value = null - window.Map_QM.util.changePlaySpeed(20) + window.Map_QM.util.changePlaySpeed(13) }) return { replay, pause, speedUp, handleReplay, togglePause, handleSpeedUp, resetPause } diff --git a/src/views/Art/Art.vue b/src/views/Art/Art.vue index 9ec387c..9cf82f3 100644 --- a/src/views/Art/Art.vue +++ b/src/views/Art/Art.vue @@ -524,7 +524,7 @@ function clickGo(item: ArtItem) { left: 32px; overflow: hidden; width: 476px; - height: 806px; + height: 775px; padding-right: 20px; } .map-right-scroll { @@ -533,7 +533,7 @@ function clickGo(item: ArtItem) { left: 1006px; overflow: hidden; width: 476px; - height: 806px; + height: 775px; padding-right: 20px; } .right-bg { diff --git a/src/views/Art/ArtMapItem.vue b/src/views/Art/ArtMapItem.vue index aa268ff..13c987c 100644 --- a/src/views/Art/ArtMapItem.vue +++ b/src/views/Art/ArtMapItem.vue @@ -4,9 +4,9 @@
-

{{ switchLanguage(artInfo, 'artworkName') }}

+
{{ switchLanguage(artInfo, 'artworkName') }}
-
{{ artInfo.author }}
+
{{ artInfo.author }}

{{ artInfo.creationYear }}

@@ -44,7 +44,8 @@ function clickGo() { position: relative; width: 456px; height: 150px; - padding: 8px; + padding: 0; + padding-left: 8px; margin-bottom: 14px; background: rgb(255 255 255 / 80%); border-radius: 12px; @@ -53,6 +54,7 @@ function clickGo() { display: inline-block; width: 240px; height: 135px; + object-fit: contain; border-radius: 8px; } .intro-container { @@ -62,7 +64,9 @@ function clickGo() { .art-title { max-width: 170px; - height: 19px; + height: 21px; + padding-top: 4px; + padding-bottom: 2px; font-size: 14px; font-family: 'font_bold'; color: #736661; @@ -73,7 +77,9 @@ function clickGo() { } .art-author { max-width: 170px; - height: 17px; + height: 18px; + padding-top: 4px; + padding-bottom: 2px; margin-top: 2px; font-size: 10px; font-family: 'font_bold'; diff --git a/src/views/Art/ArtRightItem.vue b/src/views/Art/ArtRightItem.vue index 5b670f4..76645ce 100644 --- a/src/views/Art/ArtRightItem.vue +++ b/src/views/Art/ArtRightItem.vue @@ -46,6 +46,7 @@ function clickGo() { width: 160px; height: 90.4px; border-radius: 8px; + object-fit: contain; } .intro-container { display: inline-block; diff --git a/src/views/Member/Member.vue b/src/views/Member/Member.vue index 6c1e172..aaf25e4 100644 --- a/src/views/Member/Member.vue +++ b/src/views/Member/Member.vue @@ -1,5 +1,5 @@