dev #25

Merged
zhangyao merged 3 commits from dev into test 3 years ago
  1. 12
      CHANGELOG.md
  2. 4
      package-lock.json
  3. 2
      package.json
  4. 2
      public/static/offline/JSON/GetDevCoordinateByIP.json
  5. 14
      public/static/qm/MainMap_QM.js
  6. 4
      src/components/HomeDialog/HomeDialog.vue
  7. 6
      src/composables/useFindCar.ts

12
CHANGELOG.md

@ -2,6 +2,18 @@
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.12](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.11...v1.1.0-B.12) (2023-07-04)
### Features
* 修改寻车提示语,修改地图文件 ([a4906b3](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/a4906b348eb0e80067a990dc24b7b5e51f0b8825))
### Bug Fixes
* 地图修改电梯样式 ([59059d9](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/59059d99fb97115096167272f98605c97945c1d7))
## [1.1.0-B.11](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.10...v1.1.0-B.11) (2023-06-19)

4
package-lock.json

@ -1,12 +1,12 @@
{
"name": "vue_cli_ts",
"version": "1.1.0-B.11",
"version": "1.1.0-B.12",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "vue_cli_ts",
"version": "1.1.0-B.11",
"version": "1.1.0-B.12",
"dependencies": {
"@better-scroll/core": "^2.5.0",
"@better-scroll/observe-image": "^2.5.0",

2
package.json

@ -1,6 +1,6 @@
{
"name": "vue_cli_ts",
"version": "1.1.0-B.11",
"version": "1.1.0-B.12",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",

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

@ -16,7 +16,7 @@
"ip": "192.168.1.209",
"mac": "4CEDFBCAFF27",
"location": "30",
"angle": "90",
"angle": "135",
"projectCode": "project-n-ww5jvpwnu0ads70lbkda"
}
}

14
public/static/qm/MainMap_QM.js

@ -2158,6 +2158,7 @@ MainMap_QM.prototype = {
},
onInnerMeDir: function () {
this.changeMapModel("2D");
Map_QM.controls.reset();
Map_QM.controls.maxPolarAngle = 0
Map_QM.controls.minPolarAngle = 0
if (Map_QM.util.pathStateObj.isPathState) {
@ -2171,8 +2172,10 @@ MainMap_QM.prototype = {
Map_QM.controls.target = new THREE.Vector3(0, 0, 0)
}
Map_QM.controls.setZoom(Map_QM.util.options.camZoom)
Map_QM.rotationAngle(Map_QM.util.deviceObj.angle)
Map_QM.controls.enableRotate = false
setTimeout(()=>{
Map_QM.rotationAngle(Map_QM.util.deviceObj.angle)
Map_QM.controls.enableRotate = false
},50);
},
changeMapModel: function (model) {
if (model == "2D") {
@ -2646,9 +2649,8 @@ MainMap_QM.prototype = {
*
*/
rotationAngle: function (angle) {
if(Math.abs(parseInt(angle)+Map_QM.controls.getRotateHorizontal()*180/Math.PI)>5){
Map_QM.controls.setRotateHorizontal((angle / 180) * Math.PI)
}
Map_QM.controls.setRotateHorizontal(Map_QM.controls.getRotateHorizontal());
Map_QM.controls.setRotateHorizontal((angle / 180) * Math.PI)
},
/**
* @api {方法} rotateAngle(angle) 改变垂直角度
@ -5779,7 +5781,7 @@ Facilities_QM.prototype.renderIcon = function (obj, _this, isShow = true, ele =
sc.style.display = "flex";
sc.style.width = "47px";
sc.style.justifyContent = "center";
sc.innerHTML = `<img src="./static/img/num_bg.png" width="47" height="24" /><span style="color: #A6976F; font-size: 14px; position: absolute; top: 2px;">${obj.title}</span>`;
sc.innerHTML = `<img src="./static/img/num_bg.png" width="47" height="24" /><span style="color: #A6976F; font-size: 14px; position: absolute; top: 4px;">${obj.title}</span>`;
shopDiv.append(sc);
shopDiv.dataset.name = obj.title;
shopDiv.dataset.nameEn = Map_QM.util.iconEn[obj.title];

4
src/components/HomeDialog/HomeDialog.vue

@ -51,9 +51,9 @@ function move() {
// }
// console.log('x,y :>> ', x, y)
tip.value.style.transform = `translate(${x}px,${y}px)` //
i += 0.75 //35
i += 1 //35
//10i+=3i36912...
j += 0.75
j += 1
x = i
y = j
if (i >= winWidth) {

6
src/composables/useFindCar.ts

@ -31,7 +31,11 @@ export const useFindCar = () => {
}
return
}
Message({ text: msg, type: 'success' })
if (msg) {
Message({ text: msg, type: 'success' })
} else {
Message({ type: 'success', text: '未能获取数据,请稍后重试!' })
}
} catch (error) {
Message({ text: error as string, type: 'success' })
} finally {

Loading…
Cancel
Save