diff --git a/.env.development b/.env.development index 11ba95f..b6c7e6a 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ NODE_ENV = 'development' -VUE_APP_API_URL = 'http://114.66.57.139:8088' +VUE_APP_API_URL = 'http://114.66.57.139:5002' VUE_APP_MESSAGE_SDK_DEBUG = true \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7ffee65..0cb2224 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,8 @@ "": { "version": "0.1.0", "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", + "@fit-screen/vue": "^1.0.2", "@microsoft/signalr": "^8.0.7", "@vue-office/docx": "^1.6.2", "@vue-office/excel": "^1.7.11", @@ -18,8 +20,10 @@ "echarts-liquidfill": "^3.1.0", "element-ui": "^2.15.10", "file-saver": "^2.0.5", + "lodash": "^4.17.21", "moment": "^2.30.1", "ol": "^10.5.0", + "qrcode": "^1.5.4", "vue": "^2.7.16", "vue-router": "^3.5.1", "vueshowpdf": "^1.1.2", @@ -79,6 +83,11 @@ "node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18" } }, + "node_modules/@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -1933,6 +1942,47 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@fit-screen/vue": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/@fit-screen/vue/-/vue-1.0.2.tgz", + "integrity": "sha512-Byd+yyZhMw4x7kSfbCNG212EZxrGRi6L+dsAZi+JsbIUm6Wb+/xd6d5cfhtPJ/eubLbcKLVOstlRjQaj2NPJdQ==", + "dependencies": { + "vue-demi": "^0.13.11" + }, + "peerDependencies": { + "vue": "^2.6.14 || ^3.2.39" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, + "node_modules/@fit-screen/vue/node_modules/vue-demi": { + "version": "0.13.11", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz", + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "hasInstallScript": true, + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz", @@ -4560,7 +4610,6 @@ "version": "5.0.1", "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -7380,7 +7429,6 @@ "version": "1.2.0", "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7869,6 +7917,11 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/dijkstrajs": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz", + "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==" + }, "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz", @@ -8308,8 +8361,7 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/emojis-list": { "version": "3.0.0", @@ -9946,7 +9998,6 @@ "version": "4.1.0", "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -10280,7 +10331,6 @@ "version": "2.0.5", "resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -12829,7 +12879,6 @@ "version": "3.0.0", "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -16303,7 +16352,6 @@ "version": "5.0.0", "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, "dependencies": { "p-locate": "^4.1.0" }, @@ -16314,8 +16362,7 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash.debounce": { "version": "4.0.8", @@ -18014,7 +18061,6 @@ "version": "2.3.0", "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, "dependencies": { "p-try": "^2.0.0" }, @@ -18029,7 +18075,6 @@ "version": "4.1.0", "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, "dependencies": { "p-limit": "^2.2.0" }, @@ -18114,7 +18159,6 @@ "version": "2.2.0", "resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, "engines": { "node": ">=6" } @@ -18222,7 +18266,6 @@ "version": "4.0.0", "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, "engines": { "node": ">=8" } @@ -18360,6 +18403,14 @@ "semver-compare": "^1.0.0" } }, + "node_modules/pngjs": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz", + "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/pngquant-bin": { "version": "9.0.0", "resolved": "https://registry.npmmirror.com/pngquant-bin/-/pngquant-bin-9.0.0.tgz", @@ -19574,6 +19625,121 @@ "node": ">=6" } }, + "node_modules/qrcode": { + "version": "1.5.4", + "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.4.tgz", + "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==", + "dependencies": { + "dijkstrajs": "^1.0.1", + "pngjs": "^5.0.0", + "yargs": "^15.3.1" + }, + "bin": { + "qrcode": "bin/qrcode" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/qrcode/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/qrcode/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/qrcode/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/qrcode/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/qrcode/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/qrcode/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/qrcode/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" + }, + "node_modules/qrcode/node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/qrcode/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz", @@ -19998,7 +20164,6 @@ "version": "2.1.1", "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -20012,6 +20177,11 @@ "node": ">=0.10.0" } }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz", @@ -20599,6 +20769,11 @@ "node": ">= 0.8.0" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" + }, "node_modules/set-cookie-parser": { "version": "2.7.0", "resolved": "https://registry.npmmirror.com/set-cookie-parser/-/set-cookie-parser-2.7.0.tgz", @@ -21301,7 +21476,6 @@ "version": "4.2.3", "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -21378,7 +21552,6 @@ "version": "6.0.1", "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -24057,6 +24230,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==" + }, "node_modules/which-typed-array": { "version": "1.1.15", "resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.15.tgz", diff --git a/package.json b/package.json index 0ecc3f3..350badf 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,8 @@ "start:vite": "vite" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", + "@fit-screen/vue": "^1.0.2", "@microsoft/signalr": "^8.0.7", "@vue-office/docx": "^1.6.2", "@vue-office/excel": "^1.7.11", @@ -23,8 +25,10 @@ "echarts-liquidfill": "^3.1.0", "element-ui": "^2.15.10", "file-saver": "^2.0.5", + "lodash": "^4.17.21", "moment": "^2.30.1", "ol": "^10.5.0", + "qrcode": "^1.5.4", "vue": "^2.7.16", "vue-router": "^3.5.1", "vueshowpdf": "^1.1.2", @@ -72,4 +76,4 @@ "gitHooks": { "pre-commit": "lint-staged" } -} \ No newline at end of file +} diff --git a/src/api/home.js b/src/api/home.js index ceb1a29..3927b1e 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -8,3 +8,12 @@ export function Homeview(data) { params: data }); } +// 实时位置信息 +export function HomeSyncLocation(data) { + let url = "/api/Home/syncLocation"; + return request({ + url: url, + method: "post", + data + }); +} diff --git a/src/api/login.js b/src/api/login.js index af77895..8831d15 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,3 +8,12 @@ export function login(data) { data }); } + +// 登录后 获取当前防区 +export function loginPosition(data) { + return request({ + url: "/api/Position/Details", + method: "post", + data + }); +} diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 7965235..5b35cca 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -84,6 +84,7 @@ body { background-position: center; padding: 0; margin: 0; + pointer-events: none; .header-left { width: 20%; height: 35px; @@ -228,6 +229,8 @@ body { font-weight: 400; text-align: left; line-height: 35px; + overflow: hidden; + text-overflow: ellipsis; } } .main { @@ -246,6 +249,8 @@ body { .color-ef { color: #0144ef; font-size: 1.09vw; + overflow: hidden; + text-overflow: ellipsis; } .text-fff { color: #000; @@ -292,6 +297,8 @@ body { font-weight: 400; text-align: left; line-height: 35px; + overflow: hidden; + text-overflow: ellipsis; } } .content-main { @@ -301,6 +308,8 @@ body { .color-ef { color: #0144ef; font-size: 1.09vw; + overflow: hidden; + text-overflow: ellipsis; } .text-fff { color: #000; @@ -328,6 +337,8 @@ body { width: 100%; height: 7%; text-align: left; + display: flex; + align-items: center; .text-fff { // 超出隐藏 overflow: hidden; @@ -468,10 +479,13 @@ body { .navigation-content-qrcode { width: 80px; height: 80px; - background-color: red; margin: 0 auto; margin-top: 5px; margin-bottom: 5px; + img { + width: 100%; + height: 100%; + } } } .navigation-content-btn { diff --git a/src/assets/img/icon_uav.png b/src/assets/img/icon_uav.png new file mode 100644 index 0000000..fe9fcaf Binary files /dev/null and b/src/assets/img/icon_uav.png differ diff --git a/src/assets/img/icon_user.png b/src/assets/img/icon_user.png new file mode 100644 index 0000000..a9496e2 Binary files /dev/null and b/src/assets/img/icon_user.png differ diff --git a/src/main.js b/src/main.js index de95c09..acf29dc 100644 --- a/src/main.js +++ b/src/main.js @@ -9,10 +9,10 @@ import "@/components/index.js"; import "@/plugins/element"; // 样式加载 import "@/assets/css/index.scss"; - +import FitScreen from "@fit-screen/vue"; // 全局事件总线（‌bus）‌ Vue.prototype.$bus = new Vue({}); - +Vue.use(FitScreen); new Vue({ router, store, diff --git a/src/router/index.js b/src/router/index.js index b508568..ebf9033 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -16,6 +16,9 @@ const routes = [ // 登录已过期，执行自动退出操作 localStorage.removeItem("setToken"); localStorage.removeItem("expires"); + localStorage.removeItem("userId"); + localStorage.removeItem("isAdmin"); + localStorage.removeItem("PositionIds"); next("/login"); } const token = localStorage.getItem("setToken"); diff --git a/src/store/getters.js b/src/store/getters.js index c452e5f..ee01439 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -6,6 +6,8 @@ const getters = { map: (state) => state.map.map, adsbisFlag: (state) => state.map.adsbisFlag, //是否显示adsb targetCode: (state) => state.chart.targetCode, //防护目标单一点击更改两侧数据 - airspaceCode: (state) => state.chart.airspaceCode //低空空域单一点击更改两侧数据 + airspaceCode: (state) => state.chart.airspaceCode, //低空空域单一点击更改两侧数据 + positionPoint: (state) => state.chart.positionPoint, //实时位置更新 + isZoomedIn: (state) => state.chart.isZoomedIn //音频是否打开 }; export default getters; diff --git a/src/store/modules/chart.js b/src/store/modules/chart.js index 68c48e3..b1a70da 100644 --- a/src/store/modules/chart.js +++ b/src/store/modules/chart.js @@ -8,7 +8,10 @@ const user = { endTime: "" }, targetCode: {}, - airspaceCode: {} + airspaceCode: {}, + + positionPoint: false, // 位置上报 + isZoomedIn: true // 音频是否打开 }, mutations: { @@ -29,6 +32,12 @@ const user = { }, SET_AIRSPACECODE: (state, value) => { state.airspaceCode = value; + }, + SET_POSITIONPOINT: (state, value) => { + state.positionPoint = value; + }, + SET_ISZOOMEDIN: (state, value) => { + state.isZoomedIn = value; } }, diff --git a/src/utils/request.js b/src/utils/request.js index cc0e19c..d087f73 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -33,6 +33,9 @@ service.interceptors.response.use( // 登录已过期，执行自动退出操作 localStorage.removeItem("setToken"); localStorage.removeItem("expires"); + localStorage.removeItem("userId"); + localStorage.removeItem("isAdmin"); + localStorage.removeItem("PositionIds"); router.push("/login"); } const res = response.data; diff --git a/src/views/contentData/LeftSidebar/index.vue b/src/views/contentData/LeftSidebar/index.vue index 6db3fba..5bfc3da 100644 --- a/src/views/contentData/LeftSidebar/index.vue +++ b/src/views/contentData/LeftSidebar/index.vue @@ -13,13 +13,16 @@
  • -
    +
    {{ index < 9 ? "0" + (index + 1) : index + 1 }} @@ -33,7 +36,7 @@
    距离： - {{ drone.currTime || 0 }}米 + {{ drone.distance || 0 }}米
    高度： @@ -42,7 +45,7 @@
    -
    +
    {{ index < 9 ? "0" + (index + 1) : index + 1 }} @@ -56,29 +59,29 @@
    距离： - {{ drone.currTime || 0 }}米 + {{ drone.distance || 0 }}米
    高度： {{ drone.height || 0 }}米
    -
    +
    型号： - DJI Air 2S + {{ drone.device_type }}
    更新时间： - 2025.6.15 21:12:43 + {{ drone.times }}
    无人机方位
    -
    +

    经纬度：

    @@ -91,62 +94,90 @@

    高度：

    {{ drone.height || 0 }}M

    -
    -

    速度：

    -

    {{ drone.height }}M/h

    -
    +
    +
    +

    速度：

    +

    + E：{{ drone.speed_E }} N：{{ drone.speed_N }} U：{{ + drone.speed_U + }} +

    - 飞手方位 + 飞手位置
    -
    +

    经纬度

    - {{ drone.drone_lon }}, {{ drone.drone_lat }} + {{ drone.app_lon }}, {{ drone.app_lat }}

    -
    -

    高度：

    -

    {{ drone.height || 0 }}m

    -
    - 信任 + + 信任 +
    - 导航 + + 导航 +
    -
    -
    +
    + +
    + + 导航高德地图 +
    -
    - 距我： - {{ drone.height || 0 }}米 +
    + 导航二维码 + 二维码生成中...
    -
    跳转到导航系统
    - 是 + + 是 +
    - 否 + + 否 +
    @@ -160,6 +191,7 @@ ref="uavAudio" v-show="iswarning" style="display: none" + id="uavAudio" > @@ -172,8 +204,16 @@