dev #23

Merged
zhangyao merged 2 commits from dev into test 3 years ago
  1. 7
      CHANGELOG.md
  2. 4
      package-lock.json
  3. 2
      package.json
  4. 2
      public/static/offline/JSON/GetDevCoordinateByIP.json
  5. 12
      public/static/qm/MainMap_QM.js

7
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. 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.10](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.9...v1.1.0-B.10) (2023-06-17)
### Bug Fixes
* 🧩 优化地图角度 ([da6a21e](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/da6a21e4a216c41a890dfdc8907d88d2c6033950))
## [1.1.0-B.9](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.8...v1.1.0-B.9) (2023-06-16) ## [1.1.0-B.9](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.8...v1.1.0-B.9) (2023-06-16)

4
package-lock.json

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

2
package.json

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

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

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

12
public/static/qm/MainMap_QM.js

@ -1921,6 +1921,8 @@ MainMap_QM.prototype = {
*/ */
changeMapState: function (state) { changeMapState: function (state) {
Map_QM.controls.reset(); Map_QM.controls.reset();
let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle
Map_QM.rotationAngle(angle)
if (state === "3d") { if (state === "3d") {
Map_QM.camera = Map_QM.cameraPerspective; Map_QM.camera = Map_QM.cameraPerspective;
Map_QM.controls.object = Map_QM.camera; Map_QM.controls.object = Map_QM.camera;
@ -2184,6 +2186,8 @@ MainMap_QM.prototype = {
Map_QM.controls.object = Map_QM.camera; Map_QM.controls.object = Map_QM.camera;
Map_QM.shawLight.castShadow = Map_QM.util.options.shadow; Map_QM.shawLight.castShadow = Map_QM.util.options.shadow;
Map_QM.controls.reset(); Map_QM.controls.reset();
let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle
Map_QM.rotationAngle(angle)
} }
}, },
@ -2269,6 +2273,8 @@ MainMap_QM.prototype = {
this.controls.maxAzimuthAngle = Infinity; this.controls.maxAzimuthAngle = Infinity;
this.shawLight.castShadow = this.util.options.shadow; this.shawLight.castShadow = this.util.options.shadow;
this.controls.reset(); this.controls.reset();
let angle = this.util.options.deviceAng ? this.util.deviceObj.angle : this.util.mapAngle
this.rotationAngle(angle)
}, },
/** /**
* @api {方法} changePathDir(pathState) 切换导航方向 * @api {方法} changePathDir(pathState) 切换导航方向
@ -2640,7 +2646,9 @@ MainMap_QM.prototype = {
* *
*/ */
rotationAngle: function (angle) { rotationAngle: function (angle) {
Map_QM.controls.setRotateHorizontal(angle / 180 * Math.PI);
if(Math.abs(parseInt(angle)+Map_QM.controls.getRotateHorizontal()*180/Math.PI)>5){
Map_QM.controls.setRotateHorizontal((angle / 180) * Math.PI)
}
}, },
/** /**
* @api {方法} rotateAngle(angle) 改变垂直角度 * @api {方法} rotateAngle(angle) 改变垂直角度
@ -3170,6 +3178,8 @@ MainMap_QM.prototype = {
clearTimeout(shopTime); clearTimeout(shopTime);
isJUZ = false; isJUZ = false;
Map_QM.controls.reset() Map_QM.controls.reset()
let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle
Map_QM.rotationAngle(angle)
}, 3000); }, 3000);
} }
if (debug) { if (debug) {

Loading…
Cancel
Save