diff --git a/electron-builder.yml b/electron-builder.yml index 44034e4..c0964fc 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,5 +1,5 @@ -appId: dzsp_yingjizhihuibeidou_offline_Y_save -productName: 便携式应急指挥电子沙盘系统北斗定位+ +appId: dzsp_shijingjun_offline_Y_save +productName: 实景三维电子沙盘系统 directories: buildResources: build @@ -14,12 +14,12 @@ files: asarUnpack: - resources/** win: - executableName: 便携式应急指挥电子沙盘系统北斗定位+ + executableName: 实景三维电子沙盘系统 icon: build/icons/81.ico nsis: artifactName: ${name}-${version}-setup.${ext} - shortcutName: 便携式应急指挥电子沙盘系统北斗定位+ - uninstallDisplayName: 便携式应急指挥电子沙盘系统北斗定位+ + shortcutName: 实景三维电子沙盘系统 + uninstallDisplayName: 实景三维电子沙盘系统 createDesktopShortcut: always mac: entitlementsInherit: build/entitlements.mac.plist @@ -40,7 +40,7 @@ linux: category: Utility icon: build/icons/81.png desktop: { - "Icon": "/opt/便携式应急指挥电子沙盘系统北斗定位+/icons/81.png" + "Icon": "/opt/实景三维电子沙盘系统/icons/81.png" } executableArgs: [ "--no-sandbox" diff --git a/installer.nsh b/installer.nsh index ee2c304..7ae1b15 100644 --- a/installer.nsh +++ b/installer.nsh @@ -1,9 +1,9 @@ !macro preInit SetRegView 64 - WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuibeidou_offline_Y_save" - WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuibeidou_offline_Y_save" + WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save" + WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save" #writeUninstaller $INSTDIR\uninstaller.exe SetRegView 32 - WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuibeidou_offline_Y_save" - WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_yingjizhihuibeidou_offline_Y_save" + WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save" + WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save" !macroend \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 19c7745..defaba5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@electron-toolkit/preload": "^3.0.2", "@electron-toolkit/utils": "^4.0.0", + "@electron/remote": "^2.1.3", "@ztree/ztree_v3": "^3.5.48", "axios": "^1.11.0", "clipboard": "^2.0.11", @@ -18,12 +19,14 @@ "echarts": "^6.0.0", "electron-updater": "^6.3.9", "element-plus": "^2.10.4", + "express": "^5.1.0", "mitt": "^3.0.1", "moment": "^2.30.1", "pinia": "^3.0.3", "pinia-plugin-persistedstate": "^4.4.1", "scss": "^0.2.4", "verror": "^1.10.1", + "vue-clipboard3": "^2.0.0", "vue-i18n": "^9.14.5", "vue-router": "^4.5.1", "vuedraggable": "^2.24.3" @@ -682,6 +685,15 @@ "node": ">= 10.0.0" } }, + "node_modules/@electron/remote": { + "version": "2.1.3", + "resolved": "https://registry.npmmirror.com/@electron/remote/-/remote-2.1.3.tgz", + "integrity": "sha512-XlpxC8S4ttj/v2d+PKp9na/3Ev8bV7YWNL7Cw5b9MAWgTphEml7iYgbc7V0r9D6yDOfOkj06bchZgOZdlWJGNA==", + "license": "MIT", + "peerDependencies": { + "electron": ">= 13.0.0" + } + }, "node_modules/@electron/universal": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/@electron/universal/-/universal-2.0.1.tgz", @@ -3392,6 +3404,49 @@ "dev": true, "license": "ISC" }, + "node_modules/accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "license": "MIT", + "dependencies": { + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/accepts/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/accepts/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/accepts/node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/acorn": { "version": "8.15.0", "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.15.0.tgz", @@ -4055,6 +4110,26 @@ "bluebird": "^3.5.5" } }, + "node_modules/body-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-2.2.0.tgz", + "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", + "license": "MIT", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.0", + "http-errors": "^2.0.0", + "iconv-lite": "^0.6.3", + "on-finished": "^2.4.1", + "qs": "^6.14.0", + "raw-body": "^3.0.0", + "type-is": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz", @@ -4245,6 +4320,15 @@ "node": ">= 10.0.0" } }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/cac": { "version": "6.7.14", "resolved": "https://registry.npmmirror.com/cac/-/cac-6.7.14.tgz", @@ -4433,7 +4517,6 @@ "version": "1.0.4", "resolved": "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -4890,6 +4973,27 @@ "dev": true, "license": "ISC" }, + "node_modules/content-disposition": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-1.0.0.tgz", + "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -4897,6 +5001,24 @@ "dev": true, "license": "MIT" }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "license": "MIT", + "engines": { + "node": ">=6.6.0" + } + }, "node_modules/copy-anything": { "version": "3.0.5", "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-3.0.5.tgz", @@ -5388,6 +5510,15 @@ "dev": true, "license": "MIT" }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/destr": { "version": "2.0.5", "resolved": "https://registry.npmmirror.com/destr/-/destr-2.0.5.tgz", @@ -5640,6 +5771,12 @@ "zrender": "6.0.0" } }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" + }, "node_modules/ejs": { "version": "3.1.10", "resolved": "https://registry.npmmirror.com/ejs/-/ejs-3.1.10.tgz", @@ -6003,6 +6140,15 @@ "node": ">= 4" } }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/encoding": { "version": "0.1.13", "resolved": "https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz", @@ -6527,7 +6673,6 @@ "version": "1.8.1", "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -6603,6 +6748,69 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/express": { + "version": "5.1.0", + "resolved": "https://registry.npmmirror.com/express/-/express-5.1.0.tgz", + "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", + "license": "MIT", + "dependencies": { + "accepts": "^2.0.0", + "body-parser": "^2.2.0", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/exsolve": { "version": "1.0.7", "resolved": "https://registry.npmmirror.com/exsolve/-/exsolve-1.0.7.tgz", @@ -6808,6 +7016,23 @@ "node": ">=8" } }, + "node_modules/finalhandler": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-2.1.0.tgz", + "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmmirror.com/find-up/-/find-up-5.0.0.tgz", @@ -6938,6 +7163,15 @@ "node": ">= 6" } }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -6951,6 +7185,15 @@ "node": ">=0.10.0" } }, + "node_modules/fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz", @@ -7613,6 +7856,31 @@ "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", "license": "BSD-2-Clause" }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-errors/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/http-proxy-agent": { "version": "7.0.2", "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", @@ -7686,7 +7954,6 @@ "version": "0.6.3", "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -7806,7 +8073,6 @@ "version": "2.0.4", "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, "license": "ISC" }, "node_modules/internal-slot": { @@ -7838,6 +8104,15 @@ "node": ">= 12" } }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/is-accessor-descriptor": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz", @@ -8211,6 +8486,12 @@ "node": ">=0.10.0" } }, + "node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "license": "MIT" + }, "node_modules/is-regex": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/is-regex/-/is-regex-1.2.1.tgz", @@ -8991,12 +9272,33 @@ "dev": true, "license": "CC0-1.0" }, + "node_modules/media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/memoize-one": { "version": "6.0.0", "resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz", "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==", "license": "MIT" }, + "node_modules/merge-descriptors": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/merge-options": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/merge-options/-/merge-options-1.0.1.tgz", @@ -9689,7 +9991,6 @@ "version": "1.13.4", "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -9783,6 +10084,18 @@ "node": ">= 0.2.0" } }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz", @@ -9945,6 +10258,15 @@ "node": ">=6" } }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmmirror.com/pascalcase/-/pascalcase-0.1.1.tgz", @@ -10026,6 +10348,16 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/path-to-regexp": { + "version": "8.3.0", + "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz", + "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/pathe": { "version": "2.0.3", "resolved": "https://registry.npmmirror.com/pathe/-/pathe-2.0.3.tgz", @@ -10380,6 +10712,19 @@ "node": ">=10" } }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", @@ -10406,6 +10751,21 @@ "node": ">=6" } }, + "node_modules/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/quansync": { "version": "0.2.10", "resolved": "https://registry.npmmirror.com/quansync/-/quansync-0.2.10.tgz", @@ -10470,6 +10830,46 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-3.0.1.tgz", + "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.7.0", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/read-binary-file-arch": { "version": "1.0.6", "resolved": "https://registry.npmmirror.com/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", @@ -10843,6 +11243,22 @@ "fsevents": "~2.3.2" } }, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz", @@ -10898,7 +11314,6 @@ "version": "5.2.1", "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, "funding": [ { "type": "github", @@ -10971,7 +11386,6 @@ "version": "2.1.2", "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, "license": "MIT" }, "node_modules/sanitize-filename": { @@ -11051,6 +11465,49 @@ "license": "MIT", "optional": true }, + "node_modules/send": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/send/-/send-1.2.0.tgz", + "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.5", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "mime-types": "^3.0.1", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/send/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/send/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/serialize-error": { "version": "7.0.1", "resolved": "https://registry.npmmirror.com/serialize-error/-/serialize-error-7.0.1.tgz", @@ -11067,6 +11524,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/serve-static": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "license": "MIT", + "dependencies": { + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz", @@ -11139,6 +11611,12 @@ "node": ">=0.10.0" } }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz", @@ -11166,7 +11644,6 @@ "version": "1.1.0", "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -11186,7 +11663,6 @@ "version": "1.0.0", "resolved": "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -11203,7 +11679,6 @@ "version": "1.0.1", "resolved": "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -11222,7 +11697,6 @@ "version": "1.0.2", "resolved": "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -11653,6 +12127,15 @@ "node": ">= 0.4" } }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/stop-iteration-iterator": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz", @@ -12475,6 +12958,15 @@ "node": ">=0.10.0" } }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, "node_modules/traverse": { "version": "0.6.11", "resolved": "https://registry.npmmirror.com/traverse/-/traverse-0.6.11.tgz", @@ -12548,6 +13040,41 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/type-is": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "license": "MIT", + "dependencies": { + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/type-is/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/type-is/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/typed-array-buffer": { "version": "1.0.3", "resolved": "https://registry.npmmirror.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", @@ -12832,6 +13359,15 @@ "node": ">= 4.0.0" } }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/unplugin": { "version": "2.3.5", "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-2.3.5.tgz", @@ -13162,7 +13698,6 @@ "version": "1.1.2", "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -13530,6 +14065,15 @@ } } }, + "node_modules/vue-clipboard3": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz", + "integrity": "sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==", + "license": "MIT", + "dependencies": { + "clipboard": "^2.0.6" + } + }, "node_modules/vue-eslint-parser": { "version": "10.2.0", "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-10.2.0.tgz", diff --git a/package.json b/package.json index e14adff..32174f2 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "dependencies": { "@electron-toolkit/preload": "^3.0.2", "@electron-toolkit/utils": "^4.0.0", + "@electron/remote": "^2.1.3", "@ztree/ztree_v3": "^3.5.48", "axios": "^1.11.0", "clipboard": "^2.0.11", @@ -30,6 +31,7 @@ "echarts": "^6.0.0", "electron-updater": "^6.3.9", "element-plus": "^2.10.4", + "express": "^5.1.0", "mitt": "^3.0.1", "moment": "^2.30.1", "pinia": "^3.0.3", diff --git a/resources/java/app/yjearth.jar b/resources/java/app/yjearth.jar index eb81831..e8c4bc8 100644 Binary files a/resources/java/app/yjearth.jar and b/resources/java/app/yjearth.jar differ diff --git a/src/main/app.ts b/src/main/app.ts new file mode 100644 index 0000000..b8ff8bb --- /dev/null +++ b/src/main/app.ts @@ -0,0 +1,88 @@ +let net = require("net"); +const express = require("express"); +const path = require("path"); +const { ipcMain } = require('electron'); +// const bodyParser = require("body-parser"); +import { GetHomeDir } from "./config"; + +let SERVER_PORTS = 55110; + +/** + * 检测端口是否被占用 + * @param port + * @param cb + */ + +function portIsOccupied(port, cb) { + // 创建服务并监听该端口 + port = Number(port); + let server = net.createServer().listen(port); + + server.on("listening", function() { + // 执行这块代码说明端口未被占用 + server.close(); // 关闭服务 + console.log("端口【" + port + "】 可用"); // 控制台输出信息 + SERVER_PORTS = port; + cb(port); + }); + + server.on("error", function(err) { + if (err.code === "EADDRINUSE") { + // 端口已经被使用 + console.log("端口【" + port + "】 被占用"); + portIsOccupied(++port, cb); + } + }); +} + +let apps; +let availablePort + +function createApp() { + apps = express(); + // app.use(bodyParser.json()); + // app.use(bodyParser.urlencoded({ extended: true })); + + let prefix = + process.env.NODE_ENV === "development" + ? "" + : "resources/app.asar/out/renderer/"; + let static_path = ["./", "src/renderer/public"]; + let home_dir = GetHomeDir(); + static_path.forEach((p) => { + apps.use( + express.static( + path.join(path.join(home_dir, prefix), p) /*{maxAge: 60 * 1000 * 5}*/ + ) + ); + }); +} +function start() { + createApp(); + portIsOccupied(SERVER_PORTS, (port) => { + // avilablePort挂载全局 + // console.log(apps); + apps.listen(port); + availablePort = port; + // console.log("global.sharedObject", global.avilablePort); + global.sharedObject.availablePort = port; + // ipcRenderer.invoke("set-global-variable", "avilablePort", avilablePort); + }); +} +//获取项目根目录 +// function GetHomeDir() { +// let HOME_DIR = process.cwd() + +// if (process.env.NODE_ENV === 'production') { +// let arr = process.execPath.replaceAll("\\", "/").split("/") +// arr.pop() +// HOME_DIR = arr.join("/") +// } +// return HOME_DIR +// } + +ipcMain.handle('get-available-port', () => { + return availablePort; +}); + +export { apps, start }; diff --git a/src/main/config.ts b/src/main/config.ts new file mode 100644 index 0000000..bc34112 --- /dev/null +++ b/src/main/config.ts @@ -0,0 +1,22 @@ +//获取项目根目录 +function GetHomeDir() { + let HOME_DIR = process.cwd(); + // console.log("process.env.NODE_ENV", process.env.NODE_ENV); + if (process.env.NODE_ENV === "production") { + let arr = process.execPath.replaceAll("\\", "/").split("/"); + arr.pop(); + HOME_DIR = arr.join("/"); + } + return HOME_DIR; +} +//获取项目根目录 +function GetAsar() { + let HOME_DIR = '' + if (process.env.NODE_ENV === "production") { + let arr = process.execPath.replaceAll("\\", "/").split("/"); + arr.pop(); + HOME_DIR = arr.join("/"); + } + return HOME_DIR; +} +export { GetHomeDir, GetAsar }; diff --git a/src/main/index.ts b/src/main/index.ts index 69738f8..b383362 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -6,6 +6,8 @@ import { Recorder } from "../preload/recorder"; import fs from 'fs' import { exec } from 'child_process' import dayjs from 'dayjs' +import { GetHomeDir } from './config' +import { start } from "./app"; // 开发环境路径处理 - 确保添加正确的file协议 @@ -68,6 +70,8 @@ stopBatPath = process.platform === 'win32' ? stopBatPath.replace(/^(\w:)/, '/$1' function createWindow(): void { // Create the browser window. + start(); + // 创建启动窗口 const splashWindow = new BrowserWindow({ width: 896, @@ -194,21 +198,65 @@ function createWindow(): void { } }); }); + ipcMain.on("requireGEMarkerName", (event, obj) => { + /* + * obj= { + dirName: "GEMarker", + dirName1s: "GEMarker1s" + } + * */ + + console.log('GetHomeDir()', GetHomeDir()) + let data = {}; + for (const objKey in obj) { + let files = fs.readdirSync( + path.join( + global.__static ? global.__static : GetHomeDir() + "/src/renderer/public", + obj[objKey] + ) + ); + console.log(files); + for (let i = 0; i < files.length; i++) { + files[i] = obj[objKey] + "/" + files[i]; + } + data[obj[objKey]] = files; + } + + // let files = fs.readdirSync(path.join(global.__static ? global.__static : GetHomeDir() + "/static", dirName)) + // data[dirName] = files + + event.sender.send("dirFiles", data); + }); + + let _winMap = new Map(); // 监听渲染进程创建新窗口的请求 // @ts-ignore - ipcMain.handle('create-new-window', async (event, params, url, option) => { + ipcMain.handle('create-new-window', async (event, params, url, option, id) => { try { const newWindow = await new BrowserWindow(params) if (url) { await newWindow.loadURL(url) await newWindow.webContents.send("data", option) + newWindow.on('closed', () => { + _winMap.delete(id); + // a.delete(newWindow.id) + // closeCB(newWindow.id) + }); } - return newWindow.id + _winMap.set(id, newWindow.id); + return _winMap } catch (error) { console.error('创建窗口失败:', error); throw error; // 抛出错误以便渲染进程捕获 } }) + //@ts-ignore + ipcMain.handle('show-window-by-id', async (event, id) => { + BrowserWindow.fromId(id)?.show() + }) + ipcMain.handle('get-_winMap',()=>{ + return _winMap + }) // 设置窗口标题和图标 mainWindow.webContents.setWindowOpenHandler((details) => { shell.openExternal(details.url) @@ -285,15 +333,22 @@ app.whenReady().then(() => { // for applications and their menu bar to stay active until the user quits // explicitly with Cmd + Q. app.on('window-all-closed', () => { + console.log('=================================================111111111', process.platform) if (process.platform !== 'darwin') { app.quit() } }) // 退出时注销所有快捷键 app.on('will-quit', () => { - globalShortcut.unregisterAll() + console.log('222222222222222222222') // 关闭后台服务 exec(stopBatPath.substring(1, 200), (error, stdout, stderr) => { + dialog.showMessageBox({ + type: 'info', + title: '信息1', + message: 'process.platform', + buttons: ['确定'] + }) if (error) { console.error(`执行错误: ${error.message}`); return; @@ -304,7 +359,13 @@ app.on('will-quit', () => { } console.log(`批处理输出: ${stdout}`); }); + globalShortcut.unregisterAll() }) +console.log('=================================================') +global.sharedObject = { + hasService: false, +}; + // In this file you can include the rest of your app's specific main process // code. You can also put them in separate files and require them here. diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts index 003e90b..493dc42 100644 --- a/src/renderer/components.d.ts +++ b/src/renderer/components.d.ts @@ -13,6 +13,7 @@ declare module 'vue' { ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCol: typeof import('element-plus/es')['ElCol'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElForm: typeof import('element-plus/es')['ElForm'] diff --git a/src/renderer/public/GEMarker/000AAA.png b/src/renderer/public/GEMarker/000AAA.png new file mode 100644 index 0000000..7fc48a7 Binary files /dev/null and b/src/renderer/public/GEMarker/000AAA.png differ diff --git a/src/renderer/public/GEMarker/0a1.png b/src/renderer/public/GEMarker/0a1.png new file mode 100644 index 0000000..42fadfb Binary files /dev/null and b/src/renderer/public/GEMarker/0a1.png differ diff --git a/src/renderer/public/GEMarker/1.gif b/src/renderer/public/GEMarker/1.gif new file mode 100644 index 0000000..02ecebb Binary files /dev/null and b/src/renderer/public/GEMarker/1.gif differ diff --git a/src/renderer/public/GEMarker/1.png b/src/renderer/public/GEMarker/1.png new file mode 100644 index 0000000..e714fce Binary files /dev/null and b/src/renderer/public/GEMarker/1.png differ diff --git a/src/renderer/public/GEMarker/A-Cable Car.png b/src/renderer/public/GEMarker/A-Cable Car.png new file mode 100644 index 0000000..71ef3fb Binary files /dev/null and b/src/renderer/public/GEMarker/A-Cable Car.png differ diff --git a/src/renderer/public/GEMarker/A-Signal tower.png b/src/renderer/public/GEMarker/A-Signal tower.png new file mode 100644 index 0000000..a82e234 Binary files /dev/null and b/src/renderer/public/GEMarker/A-Signal tower.png differ diff --git a/src/renderer/public/GEMarker/A-airliner.png b/src/renderer/public/GEMarker/A-airliner.png new file mode 100644 index 0000000..a29f515 Binary files /dev/null and b/src/renderer/public/GEMarker/A-airliner.png differ diff --git a/src/renderer/public/GEMarker/A-airports.png b/src/renderer/public/GEMarker/A-airports.png new file mode 100644 index 0000000..844e7fd Binary files /dev/null and b/src/renderer/public/GEMarker/A-airports.png differ diff --git a/src/renderer/public/GEMarker/A-blu-blank.png b/src/renderer/public/GEMarker/A-blu-blank.png new file mode 100644 index 0000000..a86ae88 Binary files /dev/null and b/src/renderer/public/GEMarker/A-blu-blank.png differ diff --git a/src/renderer/public/GEMarker/A-blu-circle.png b/src/renderer/public/GEMarker/A-blu-circle.png new file mode 100644 index 0000000..b229c93 Binary files /dev/null and b/src/renderer/public/GEMarker/A-blu-circle.png differ diff --git a/src/renderer/public/GEMarker/A-blu-square.png b/src/renderer/public/GEMarker/A-blu-square.png new file mode 100644 index 0000000..984623d Binary files /dev/null and b/src/renderer/public/GEMarker/A-blu-square.png differ diff --git a/src/renderer/public/GEMarker/A-blu-stars.png b/src/renderer/public/GEMarker/A-blu-stars.png new file mode 100644 index 0000000..fee2408 Binary files /dev/null and b/src/renderer/public/GEMarker/A-blu-stars.png differ diff --git a/src/renderer/public/GEMarker/A-bus.png b/src/renderer/public/GEMarker/A-bus.png new file mode 100644 index 0000000..c91f78a Binary files /dev/null and b/src/renderer/public/GEMarker/A-bus.png differ diff --git a/src/renderer/public/GEMarker/A-cabs.png b/src/renderer/public/GEMarker/A-cabs.png new file mode 100644 index 0000000..82c97da Binary files /dev/null and b/src/renderer/public/GEMarker/A-cabs.png differ diff --git a/src/renderer/public/GEMarker/A-camera1.png b/src/renderer/public/GEMarker/A-camera1.png new file mode 100644 index 0000000..602e072 Binary files /dev/null and b/src/renderer/public/GEMarker/A-camera1.png differ diff --git a/src/renderer/public/GEMarker/A-ciclr-blue.png b/src/renderer/public/GEMarker/A-ciclr-blue.png new file mode 100644 index 0000000..76a3cb9 Binary files /dev/null and b/src/renderer/public/GEMarker/A-ciclr-blue.png differ diff --git a/src/renderer/public/GEMarker/A-ferry.png b/src/renderer/public/GEMarker/A-ferry.png new file mode 100644 index 0000000..6f38a1f Binary files /dev/null and b/src/renderer/public/GEMarker/A-ferry.png differ diff --git a/src/renderer/public/GEMarker/A-heliport.png b/src/renderer/public/GEMarker/A-heliport.png new file mode 100644 index 0000000..05ee857 Binary files /dev/null and b/src/renderer/public/GEMarker/A-heliport.png differ diff --git a/src/renderer/public/GEMarker/A-homegardenbusiness.png b/src/renderer/public/GEMarker/A-homegardenbusiness.png new file mode 100644 index 0000000..db2f8c7 Binary files /dev/null and b/src/renderer/public/GEMarker/A-homegardenbusiness.png differ diff --git a/src/renderer/public/GEMarker/A-location.png b/src/renderer/public/GEMarker/A-location.png new file mode 100644 index 0000000..d1aef97 Binary files /dev/null and b/src/renderer/public/GEMarker/A-location.png differ diff --git a/src/renderer/public/GEMarker/A-man.png b/src/renderer/public/GEMarker/A-man.png new file mode 100644 index 0000000..a053257 Binary files /dev/null and b/src/renderer/public/GEMarker/A-man.png differ diff --git a/src/renderer/public/GEMarker/A-partly_cloudy.png b/src/renderer/public/GEMarker/A-partly_cloudy.png new file mode 100644 index 0000000..934b000 Binary files /dev/null and b/src/renderer/public/GEMarker/A-partly_cloudy.png differ diff --git a/src/renderer/public/GEMarker/A-rail.png b/src/renderer/public/GEMarker/A-rail.png new file mode 100644 index 0000000..f585ab5 Binary files /dev/null and b/src/renderer/public/GEMarker/A-rail.png differ diff --git a/src/renderer/public/GEMarker/A-realestate.png b/src/renderer/public/GEMarker/A-realestate.png new file mode 100644 index 0000000..aa7a3ad Binary files /dev/null and b/src/renderer/public/GEMarker/A-realestate.png differ diff --git a/src/renderer/public/GEMarker/A-sensor.png b/src/renderer/public/GEMarker/A-sensor.png new file mode 100644 index 0000000..9b9fda1 Binary files /dev/null and b/src/renderer/public/GEMarker/A-sensor.png differ diff --git a/src/renderer/public/GEMarker/A-subway.png b/src/renderer/public/GEMarker/A-subway.png new file mode 100644 index 0000000..5dc0a62 Binary files /dev/null and b/src/renderer/public/GEMarker/A-subway.png differ diff --git a/src/renderer/public/GEMarker/A-take-off.png b/src/renderer/public/GEMarker/A-take-off.png new file mode 100644 index 0000000..a4da794 Binary files /dev/null and b/src/renderer/public/GEMarker/A-take-off.png differ diff --git a/src/renderer/public/GEMarker/A-toilets.png b/src/renderer/public/GEMarker/A-toilets.png new file mode 100644 index 0000000..65ee27c Binary files /dev/null and b/src/renderer/public/GEMarker/A-toilets.png differ diff --git a/src/renderer/public/GEMarker/A-traffic lights.png b/src/renderer/public/GEMarker/A-traffic lights.png new file mode 100644 index 0000000..d94f8a5 Binary files /dev/null and b/src/renderer/public/GEMarker/A-traffic lights.png differ diff --git a/src/renderer/public/GEMarker/A-truck.png b/src/renderer/public/GEMarker/A-truck.png new file mode 100644 index 0000000..2150b86 Binary files /dev/null and b/src/renderer/public/GEMarker/A-truck.png differ diff --git a/src/renderer/public/GEMarker/A-warplane.png b/src/renderer/public/GEMarker/A-warplane.png new file mode 100644 index 0000000..aed3ec7 Binary files /dev/null and b/src/renderer/public/GEMarker/A-warplane.png differ diff --git a/src/renderer/public/GEMarker/A-water.png b/src/renderer/public/GEMarker/A-water.png new file mode 100644 index 0000000..a587972 Binary files /dev/null and b/src/renderer/public/GEMarker/A-water.png differ diff --git a/src/renderer/public/GEMarker/A-wharf.png b/src/renderer/public/GEMarker/A-wharf.png new file mode 100644 index 0000000..63ef1c0 Binary files /dev/null and b/src/renderer/public/GEMarker/A-wharf.png differ diff --git a/src/renderer/public/GEMarker/A-woman.png b/src/renderer/public/GEMarker/A-woman.png new file mode 100644 index 0000000..ea7b66d Binary files /dev/null and b/src/renderer/public/GEMarker/A-woman.png differ diff --git a/src/renderer/public/GEMarker/B-bank.png b/src/renderer/public/GEMarker/B-bank.png new file mode 100644 index 0000000..9763da2 Binary files /dev/null and b/src/renderer/public/GEMarker/B-bank.png differ diff --git a/src/renderer/public/GEMarker/B-camera2.png b/src/renderer/public/GEMarker/B-camera2.png new file mode 100644 index 0000000..a1296d7 Binary files /dev/null and b/src/renderer/public/GEMarker/B-camera2.png differ diff --git a/src/renderer/public/GEMarker/B-dollar.png b/src/renderer/public/GEMarker/B-dollar.png new file mode 100644 index 0000000..ac39dbf Binary files /dev/null and b/src/renderer/public/GEMarker/B-dollar.png differ diff --git a/src/renderer/public/GEMarker/B-euro.png b/src/renderer/public/GEMarker/B-euro.png new file mode 100644 index 0000000..d29fa0f Binary files /dev/null and b/src/renderer/public/GEMarker/B-euro.png differ diff --git a/src/renderer/public/GEMarker/B-fire control.png b/src/renderer/public/GEMarker/B-fire control.png new file mode 100644 index 0000000..2a9a7c9 Binary files /dev/null and b/src/renderer/public/GEMarker/B-fire control.png differ diff --git a/src/renderer/public/GEMarker/B-gas_stations.png b/src/renderer/public/GEMarker/B-gas_stations.png new file mode 100644 index 0000000..91dcd10 Binary files /dev/null and b/src/renderer/public/GEMarker/B-gas_stations.png differ diff --git a/src/renderer/public/GEMarker/B-government.png b/src/renderer/public/GEMarker/B-government.png new file mode 100644 index 0000000..e8b00d8 Binary files /dev/null and b/src/renderer/public/GEMarker/B-government.png differ diff --git a/src/renderer/public/GEMarker/B-hospital.png b/src/renderer/public/GEMarker/B-hospital.png new file mode 100644 index 0000000..a3f8541 Binary files /dev/null and b/src/renderer/public/GEMarker/B-hospital.png differ diff --git a/src/renderer/public/GEMarker/B-police office.png b/src/renderer/public/GEMarker/B-police office.png new file mode 100644 index 0000000..123da58 Binary files /dev/null and b/src/renderer/public/GEMarker/B-police office.png differ diff --git a/src/renderer/public/GEMarker/B-police.png b/src/renderer/public/GEMarker/B-police.png new file mode 100644 index 0000000..16ad51f Binary files /dev/null and b/src/renderer/public/GEMarker/B-police.png differ diff --git a/src/renderer/public/GEMarker/B-school.png b/src/renderer/public/GEMarker/B-school.png new file mode 100644 index 0000000..35090d3 Binary files /dev/null and b/src/renderer/public/GEMarker/B-school.png differ diff --git a/src/renderer/public/GEMarker/B-wheel_chair_accessible.png b/src/renderer/public/GEMarker/B-wheel_chair_accessible.png new file mode 100644 index 0000000..8cc1455 Binary files /dev/null and b/src/renderer/public/GEMarker/B-wheel_chair_accessible.png differ diff --git a/src/renderer/public/GEMarker/B-yen.png b/src/renderer/public/GEMarker/B-yen.png new file mode 100644 index 0000000..4afa090 Binary files /dev/null and b/src/renderer/public/GEMarker/B-yen.png differ diff --git a/src/renderer/public/GEMarker/B-ylw-diamond.png b/src/renderer/public/GEMarker/B-ylw-diamond.png new file mode 100644 index 0000000..db2f4db Binary files /dev/null and b/src/renderer/public/GEMarker/B-ylw-diamond.png differ diff --git a/src/renderer/public/GEMarker/B-ylw-stars.png b/src/renderer/public/GEMarker/B-ylw-stars.png new file mode 100644 index 0000000..21faf04 Binary files /dev/null and b/src/renderer/public/GEMarker/B-ylw-stars.png differ diff --git a/src/renderer/public/GEMarker/B-zhuixing.png b/src/renderer/public/GEMarker/B-zhuixing.png new file mode 100644 index 0000000..12b8465 Binary files /dev/null and b/src/renderer/public/GEMarker/B-zhuixing.png differ diff --git a/src/renderer/public/GEMarker/C-Shop.png b/src/renderer/public/GEMarker/C-Shop.png new file mode 100644 index 0000000..24ac494 Binary files /dev/null and b/src/renderer/public/GEMarker/C-Shop.png differ diff --git a/src/renderer/public/GEMarker/C-arts.png b/src/renderer/public/GEMarker/C-arts.png new file mode 100644 index 0000000..0d35ba1 Binary files /dev/null and b/src/renderer/public/GEMarker/C-arts.png differ diff --git a/src/renderer/public/GEMarker/C-bars.png b/src/renderer/public/GEMarker/C-bars.png new file mode 100644 index 0000000..2638333 Binary files /dev/null and b/src/renderer/public/GEMarker/C-bars.png differ diff --git a/src/renderer/public/GEMarker/C-coffee.png b/src/renderer/public/GEMarker/C-coffee.png new file mode 100644 index 0000000..4c448fa Binary files /dev/null and b/src/renderer/public/GEMarker/C-coffee.png differ diff --git a/src/renderer/public/GEMarker/C-convenience.png b/src/renderer/public/GEMarker/C-convenience.png new file mode 100644 index 0000000..158c334 Binary files /dev/null and b/src/renderer/public/GEMarker/C-convenience.png differ diff --git a/src/renderer/public/GEMarker/C-dining.png b/src/renderer/public/GEMarker/C-dining.png new file mode 100644 index 0000000..a455480 Binary files /dev/null and b/src/renderer/public/GEMarker/C-dining.png differ diff --git a/src/renderer/public/GEMarker/C-grocery.png b/src/renderer/public/GEMarker/C-grocery.png new file mode 100644 index 0000000..90b4fcd Binary files /dev/null and b/src/renderer/public/GEMarker/C-grocery.png differ diff --git a/src/renderer/public/GEMarker/C-lodging.png b/src/renderer/public/GEMarker/C-lodging.png new file mode 100644 index 0000000..59af618 Binary files /dev/null and b/src/renderer/public/GEMarker/C-lodging.png differ diff --git a/src/renderer/public/GEMarker/C-movies.png b/src/renderer/public/GEMarker/C-movies.png new file mode 100644 index 0000000..efe027a Binary files /dev/null and b/src/renderer/public/GEMarker/C-movies.png differ diff --git a/src/renderer/public/GEMarker/C-parks.png b/src/renderer/public/GEMarker/C-parks.png new file mode 100644 index 0000000..24d5295 Binary files /dev/null and b/src/renderer/public/GEMarker/C-parks.png differ diff --git a/src/renderer/public/GEMarker/C-residential quarters.png b/src/renderer/public/GEMarker/C-residential quarters.png new file mode 100644 index 0000000..ac85520 Binary files /dev/null and b/src/renderer/public/GEMarker/C-residential quarters.png differ diff --git a/src/renderer/public/GEMarker/C-salon.png b/src/renderer/public/GEMarker/C-salon.png new file mode 100644 index 0000000..2cf0b71 Binary files /dev/null and b/src/renderer/public/GEMarker/C-salon.png differ diff --git a/src/renderer/public/GEMarker/C-snack_bar.png b/src/renderer/public/GEMarker/C-snack_bar.png new file mode 100644 index 0000000..969a2b4 Binary files /dev/null and b/src/renderer/public/GEMarker/C-snack_bar.png differ diff --git a/src/renderer/public/GEMarker/D-DefaultIcon.png b/src/renderer/public/GEMarker/D-DefaultIcon.png new file mode 100644 index 0000000..d0e86b0 Binary files /dev/null and b/src/renderer/public/GEMarker/D-DefaultIcon.png differ diff --git a/src/renderer/public/GEMarker/D-Left.png b/src/renderer/public/GEMarker/D-Left.png new file mode 100644 index 0000000..1eec39f Binary files /dev/null and b/src/renderer/public/GEMarker/D-Left.png differ diff --git a/src/renderer/public/GEMarker/D-battery.png b/src/renderer/public/GEMarker/D-battery.png new file mode 100644 index 0000000..c068b12 Binary files /dev/null and b/src/renderer/public/GEMarker/D-battery.png differ diff --git a/src/renderer/public/GEMarker/D-earthquake.png b/src/renderer/public/GEMarker/D-earthquake.png new file mode 100644 index 0000000..43a99ab Binary files /dev/null and b/src/renderer/public/GEMarker/D-earthquake.png differ diff --git a/src/renderer/public/GEMarker/D-electricity.png b/src/renderer/public/GEMarker/D-electricity.png new file mode 100644 index 0000000..679ac3b Binary files /dev/null and b/src/renderer/public/GEMarker/D-electricity.png differ diff --git a/src/renderer/public/GEMarker/D-front.png b/src/renderer/public/GEMarker/D-front.png new file mode 100644 index 0000000..5f51f3a Binary files /dev/null and b/src/renderer/public/GEMarker/D-front.png differ diff --git a/src/renderer/public/GEMarker/D-no entry.png b/src/renderer/public/GEMarker/D-no entry.png new file mode 100644 index 0000000..067dcc1 Binary files /dev/null and b/src/renderer/public/GEMarker/D-no entry.png differ diff --git a/src/renderer/public/GEMarker/D-no stopping.png b/src/renderer/public/GEMarker/D-no stopping.png new file mode 100644 index 0000000..d86ad01 Binary files /dev/null and b/src/renderer/public/GEMarker/D-no stopping.png differ diff --git a/src/renderer/public/GEMarker/D-nuclear_power.png b/src/renderer/public/GEMarker/D-nuclear_power.png new file mode 100644 index 0000000..ff8e17a Binary files /dev/null and b/src/renderer/public/GEMarker/D-nuclear_power.png differ diff --git a/src/renderer/public/GEMarker/D-power_overview.png b/src/renderer/public/GEMarker/D-power_overview.png new file mode 100644 index 0000000..c6326af Binary files /dev/null and b/src/renderer/public/GEMarker/D-power_overview.png differ diff --git a/src/renderer/public/GEMarker/D-power_transmission_tower.png b/src/renderer/public/GEMarker/D-power_transmission_tower.png new file mode 100644 index 0000000..0b6209c Binary files /dev/null and b/src/renderer/public/GEMarker/D-power_transmission_tower.png differ diff --git a/src/renderer/public/GEMarker/D-red-diamond.png b/src/renderer/public/GEMarker/D-red-diamond.png new file mode 100644 index 0000000..fca7b84 Binary files /dev/null and b/src/renderer/public/GEMarker/D-red-diamond.png differ diff --git a/src/renderer/public/GEMarker/D-red-stars.png b/src/renderer/public/GEMarker/D-red-stars.png new file mode 100644 index 0000000..524c8dc Binary files /dev/null and b/src/renderer/public/GEMarker/D-red-stars.png differ diff --git a/src/renderer/public/GEMarker/D-right.png b/src/renderer/public/GEMarker/D-right.png new file mode 100644 index 0000000..ad836f5 Binary files /dev/null and b/src/renderer/public/GEMarker/D-right.png differ diff --git a/src/renderer/public/GEMarker/D-tower.png b/src/renderer/public/GEMarker/D-tower.png new file mode 100644 index 0000000..bfae89b Binary files /dev/null and b/src/renderer/public/GEMarker/D-tower.png differ diff --git a/src/renderer/public/GEMarker/D-transformer.png b/src/renderer/public/GEMarker/D-transformer.png new file mode 100644 index 0000000..94082e8 Binary files /dev/null and b/src/renderer/public/GEMarker/D-transformer.png differ diff --git a/src/renderer/public/GEMarker/D-transformer_substation.png b/src/renderer/public/GEMarker/D-transformer_substation.png new file mode 100644 index 0000000..49a3ec3 Binary files /dev/null and b/src/renderer/public/GEMarker/D-transformer_substation.png differ diff --git a/src/renderer/public/GEMarker/D-turn Left right.png b/src/renderer/public/GEMarker/D-turn Left right.png new file mode 100644 index 0000000..694b0f6 Binary files /dev/null and b/src/renderer/public/GEMarker/D-turn Left right.png differ diff --git a/src/renderer/public/GEMarker/D-turn a corner.png b/src/renderer/public/GEMarker/D-turn a corner.png new file mode 100644 index 0000000..20b7fb4 Binary files /dev/null and b/src/renderer/public/GEMarker/D-turn a corner.png differ diff --git a/src/renderer/public/GEMarker/D-volcano.png b/src/renderer/public/GEMarker/D-volcano.png new file mode 100644 index 0000000..961fc6f Binary files /dev/null and b/src/renderer/public/GEMarker/D-volcano.png differ diff --git a/src/renderer/public/GEMarker/D-voltage.png b/src/renderer/public/GEMarker/D-voltage.png new file mode 100644 index 0000000..d65957c Binary files /dev/null and b/src/renderer/public/GEMarker/D-voltage.png differ diff --git a/src/renderer/public/GEMarker/E-Collapse.png b/src/renderer/public/GEMarker/E-Collapse.png new file mode 100644 index 0000000..4b3a4c1 Binary files /dev/null and b/src/renderer/public/GEMarker/E-Collapse.png differ diff --git a/src/renderer/public/GEMarker/E-construction.png b/src/renderer/public/GEMarker/E-construction.png new file mode 100644 index 0000000..5035f7a Binary files /dev/null and b/src/renderer/public/GEMarker/E-construction.png differ diff --git a/src/renderer/public/GEMarker/E-falling_rocks.png b/src/renderer/public/GEMarker/E-falling_rocks.png new file mode 100644 index 0000000..9c4e196 Binary files /dev/null and b/src/renderer/public/GEMarker/E-falling_rocks.png differ diff --git a/src/renderer/public/GEMarker/F-NEVs.png b/src/renderer/public/GEMarker/F-NEVs.png new file mode 100644 index 0000000..64369ce Binary files /dev/null and b/src/renderer/public/GEMarker/F-NEVs.png differ diff --git a/src/renderer/public/GEMarker/F-charging_pile.png b/src/renderer/public/GEMarker/F-charging_pile.png new file mode 100644 index 0000000..3177f95 Binary files /dev/null and b/src/renderer/public/GEMarker/F-charging_pile.png differ diff --git a/src/renderer/public/GEMarker/F-factory.png b/src/renderer/public/GEMarker/F-factory.png new file mode 100644 index 0000000..556dd70 Binary files /dev/null and b/src/renderer/public/GEMarker/F-factory.png differ diff --git a/src/renderer/public/GEMarker/F-fishing.png b/src/renderer/public/GEMarker/F-fishing.png new file mode 100644 index 0000000..4873e89 Binary files /dev/null and b/src/renderer/public/GEMarker/F-fishing.png differ diff --git a/src/renderer/public/GEMarker/F-golf.png b/src/renderer/public/GEMarker/F-golf.png new file mode 100644 index 0000000..c16d3c8 Binary files /dev/null and b/src/renderer/public/GEMarker/F-golf.png differ diff --git a/src/renderer/public/GEMarker/F-grn-circle.png b/src/renderer/public/GEMarker/F-grn-circle.png new file mode 100644 index 0000000..ad2265a Binary files /dev/null and b/src/renderer/public/GEMarker/F-grn-circle.png differ diff --git a/src/renderer/public/GEMarker/F-hiker.png b/src/renderer/public/GEMarker/F-hiker.png new file mode 100644 index 0000000..96bd444 Binary files /dev/null and b/src/renderer/public/GEMarker/F-hiker.png differ diff --git a/src/renderer/public/GEMarker/F-horsebackriding.png b/src/renderer/public/GEMarker/F-horsebackriding.png new file mode 100644 index 0000000..34bbe96 Binary files /dev/null and b/src/renderer/public/GEMarker/F-horsebackriding.png differ diff --git a/src/renderer/public/GEMarker/F-hydro-plant.png b/src/renderer/public/GEMarker/F-hydro-plant.png new file mode 100644 index 0000000..a858798 Binary files /dev/null and b/src/renderer/public/GEMarker/F-hydro-plant.png differ diff --git a/src/renderer/public/GEMarker/F-meter.png b/src/renderer/public/GEMarker/F-meter.png new file mode 100644 index 0000000..77c7910 Binary files /dev/null and b/src/renderer/public/GEMarker/F-meter.png differ diff --git a/src/renderer/public/GEMarker/F-parking_lot.png b/src/renderer/public/GEMarker/F-parking_lot.png new file mode 100644 index 0000000..ed2d437 Binary files /dev/null and b/src/renderer/public/GEMarker/F-parking_lot.png differ diff --git a/src/renderer/public/GEMarker/F-photovoltaic .png b/src/renderer/public/GEMarker/F-photovoltaic .png new file mode 100644 index 0000000..4370e4f Binary files /dev/null and b/src/renderer/public/GEMarker/F-photovoltaic .png differ diff --git a/src/renderer/public/GEMarker/F-play.png b/src/renderer/public/GEMarker/F-play.png new file mode 100644 index 0000000..96efa82 Binary files /dev/null and b/src/renderer/public/GEMarker/F-play.png differ diff --git a/src/renderer/public/GEMarker/F-ycling.png b/src/renderer/public/GEMarker/F-ycling.png new file mode 100644 index 0000000..eee63c6 Binary files /dev/null and b/src/renderer/public/GEMarker/F-ycling.png differ diff --git a/src/renderer/public/GEMarker/a.png b/src/renderer/public/GEMarker/a.png new file mode 100644 index 0000000..dc7547c Binary files /dev/null and b/src/renderer/public/GEMarker/a.png differ diff --git a/src/renderer/public/GEMarker/picture.png b/src/renderer/public/GEMarker/picture.png new file mode 100644 index 0000000..4b41cf8 Binary files /dev/null and b/src/renderer/public/GEMarker/picture.png differ diff --git a/src/renderer/public/GEMarker/playground.png b/src/renderer/public/GEMarker/playground.png new file mode 100644 index 0000000..cf45a45 Binary files /dev/null and b/src/renderer/public/GEMarker/playground.png differ diff --git a/src/renderer/public/GEMarker/pond.png b/src/renderer/public/GEMarker/pond.png new file mode 100644 index 0000000..4cea1bc Binary files /dev/null and b/src/renderer/public/GEMarker/pond.png differ diff --git a/src/renderer/public/GEMarker/pool.png b/src/renderer/public/GEMarker/pool.png new file mode 100644 index 0000000..70acc05 Binary files /dev/null and b/src/renderer/public/GEMarker/pool.png differ diff --git a/src/renderer/public/GEMarker/power_station.png b/src/renderer/public/GEMarker/power_station.png new file mode 100644 index 0000000..34101be Binary files /dev/null and b/src/renderer/public/GEMarker/power_station.png differ diff --git a/src/renderer/public/GEMarker/pumping_storage.png b/src/renderer/public/GEMarker/pumping_storage.png new file mode 100644 index 0000000..0fdfbb5 Binary files /dev/null and b/src/renderer/public/GEMarker/pumping_storage.png differ diff --git a/src/renderer/public/GEMarker/ranger_station.png b/src/renderer/public/GEMarker/ranger_station.png new file mode 100644 index 0000000..1a47f99 Binary files /dev/null and b/src/renderer/public/GEMarker/ranger_station.png differ diff --git a/src/renderer/public/GEMarker/rivers.png b/src/renderer/public/GEMarker/rivers.png new file mode 100644 index 0000000..9295b4b Binary files /dev/null and b/src/renderer/public/GEMarker/rivers.png differ diff --git a/src/renderer/public/GEMarker/ski.png b/src/renderer/public/GEMarker/ski.png new file mode 100644 index 0000000..baef6dc Binary files /dev/null and b/src/renderer/public/GEMarker/ski.png differ diff --git a/src/renderer/public/GEMarker/solar_energy.png b/src/renderer/public/GEMarker/solar_energy.png new file mode 100644 index 0000000..e122f9d Binary files /dev/null and b/src/renderer/public/GEMarker/solar_energy.png differ diff --git a/src/renderer/public/GEMarker/swimming.png b/src/renderer/public/GEMarker/swimming.png new file mode 100644 index 0000000..8cdacc4 Binary files /dev/null and b/src/renderer/public/GEMarker/swimming.png differ diff --git a/src/renderer/public/GEMarker/testp1.gif b/src/renderer/public/GEMarker/testp1.gif new file mode 100644 index 0000000..4044d7e Binary files /dev/null and b/src/renderer/public/GEMarker/testp1.gif differ diff --git a/src/renderer/public/GEMarker/vr.png b/src/renderer/public/GEMarker/vr.png new file mode 100644 index 0000000..f8d16e9 Binary files /dev/null and b/src/renderer/public/GEMarker/vr.png differ diff --git a/src/renderer/public/GEMarker/wind_power_generation .png b/src/renderer/public/GEMarker/wind_power_generation .png new file mode 100644 index 0000000..a2c7746 Binary files /dev/null and b/src/renderer/public/GEMarker/wind_power_generation .png differ diff --git a/src/renderer/public/GEMarker/worker.png b/src/renderer/public/GEMarker/worker.png new file mode 100644 index 0000000..16f73d5 Binary files /dev/null and b/src/renderer/public/GEMarker/worker.png differ diff --git a/src/renderer/public/GEMarker/欧元.png b/src/renderer/public/GEMarker/欧元.png new file mode 100644 index 0000000..c960f05 Binary files /dev/null and b/src/renderer/public/GEMarker/欧元.png differ diff --git a/src/renderer/public/GEMarker1/A-Signal tower.png b/src/renderer/public/GEMarker1/A-Signal tower.png new file mode 100644 index 0000000..3303986 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-Signal tower.png differ diff --git a/src/renderer/public/GEMarker1/A-VR.png b/src/renderer/public/GEMarker1/A-VR.png new file mode 100644 index 0000000..c1bc331 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-VR.png differ diff --git a/src/renderer/public/GEMarker1/A-ablu-blank.png b/src/renderer/public/GEMarker1/A-ablu-blank.png new file mode 100644 index 0000000..934cd9f Binary files /dev/null and b/src/renderer/public/GEMarker1/A-ablu-blank.png differ diff --git a/src/renderer/public/GEMarker1/A-airports.png b/src/renderer/public/GEMarker1/A-airports.png new file mode 100644 index 0000000..0e876e8 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-airports.png differ diff --git a/src/renderer/public/GEMarker1/A-blu-circle.png b/src/renderer/public/GEMarker1/A-blu-circle.png new file mode 100644 index 0000000..c868594 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-blu-circle.png differ diff --git a/src/renderer/public/GEMarker1/A-blu-square.png b/src/renderer/public/GEMarker1/A-blu-square.png new file mode 100644 index 0000000..0c4a0df Binary files /dev/null and b/src/renderer/public/GEMarker1/A-blu-square.png differ diff --git a/src/renderer/public/GEMarker1/A-blu-stars.png b/src/renderer/public/GEMarker1/A-blu-stars.png new file mode 100644 index 0000000..4d86321 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-blu-stars.png differ diff --git a/src/renderer/public/GEMarker1/A-bus.png b/src/renderer/public/GEMarker1/A-bus.png new file mode 100644 index 0000000..d1ea036 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-bus.png differ diff --git a/src/renderer/public/GEMarker1/A-cabs.png b/src/renderer/public/GEMarker1/A-cabs.png new file mode 100644 index 0000000..eb5bf01 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-cabs.png differ diff --git a/src/renderer/public/GEMarker1/A-camera1.png b/src/renderer/public/GEMarker1/A-camera1.png new file mode 100644 index 0000000..6b49914 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-camera1.png differ diff --git a/src/renderer/public/GEMarker1/A-ferry.png b/src/renderer/public/GEMarker1/A-ferry.png new file mode 100644 index 0000000..886163c Binary files /dev/null and b/src/renderer/public/GEMarker1/A-ferry.png differ diff --git a/src/renderer/public/GEMarker1/A-heliport.png b/src/renderer/public/GEMarker1/A-heliport.png new file mode 100644 index 0000000..05e18c4 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-heliport.png differ diff --git a/src/renderer/public/GEMarker1/A-homegardenbusiness.png b/src/renderer/public/GEMarker1/A-homegardenbusiness.png new file mode 100644 index 0000000..954fb37 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-homegardenbusiness.png differ diff --git a/src/renderer/public/GEMarker1/A-location.png b/src/renderer/public/GEMarker1/A-location.png new file mode 100644 index 0000000..efa94a9 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-location.png differ diff --git a/src/renderer/public/GEMarker1/A-rail.png b/src/renderer/public/GEMarker1/A-rail.png new file mode 100644 index 0000000..741099f Binary files /dev/null and b/src/renderer/public/GEMarker1/A-rail.png differ diff --git a/src/renderer/public/GEMarker1/A-subway.png b/src/renderer/public/GEMarker1/A-subway.png new file mode 100644 index 0000000..cd4f0cd Binary files /dev/null and b/src/renderer/public/GEMarker1/A-subway.png differ diff --git a/src/renderer/public/GEMarker1/A-traffic lights.png b/src/renderer/public/GEMarker1/A-traffic lights.png new file mode 100644 index 0000000..beb60c7 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-traffic lights.png differ diff --git a/src/renderer/public/GEMarker1/A-truck.png b/src/renderer/public/GEMarker1/A-truck.png new file mode 100644 index 0000000..0a4e5dc Binary files /dev/null and b/src/renderer/public/GEMarker1/A-truck.png differ diff --git a/src/renderer/public/GEMarker1/A-water.png b/src/renderer/public/GEMarker1/A-water.png new file mode 100644 index 0000000..4b66dd5 Binary files /dev/null and b/src/renderer/public/GEMarker1/A-water.png differ diff --git a/src/renderer/public/GEMarker1/A-wharf.png b/src/renderer/public/GEMarker1/A-wharf.png new file mode 100644 index 0000000..190f7db Binary files /dev/null and b/src/renderer/public/GEMarker1/A-wharf.png differ diff --git a/src/renderer/public/GEMarker1/C-residential quarters.png b/src/renderer/public/GEMarker1/C-residential quarters.png new file mode 100644 index 0000000..39bcfa5 Binary files /dev/null and b/src/renderer/public/GEMarker1/C-residential quarters.png differ diff --git a/src/renderer/public/GEMarker1/D-DefaultIcon.png b/src/renderer/public/GEMarker1/D-DefaultIcon.png new file mode 100644 index 0000000..906c946 Binary files /dev/null and b/src/renderer/public/GEMarker1/D-DefaultIcon.png differ diff --git a/src/renderer/public/GEMarker1/D-earthquake.png b/src/renderer/public/GEMarker1/D-earthquake.png new file mode 100644 index 0000000..983fc36 Binary files /dev/null and b/src/renderer/public/GEMarker1/D-earthquake.png differ diff --git a/src/renderer/public/GEMarker1/D-nuclear_power.png b/src/renderer/public/GEMarker1/D-nuclear_power.png new file mode 100644 index 0000000..243b4a8 Binary files /dev/null and b/src/renderer/public/GEMarker1/D-nuclear_power.png differ diff --git a/src/renderer/public/GEMarker1/D-power_transmission_tower.png b/src/renderer/public/GEMarker1/D-power_transmission_tower.png new file mode 100644 index 0000000..4cf9ca4 Binary files /dev/null and b/src/renderer/public/GEMarker1/D-power_transmission_tower.png differ diff --git a/src/renderer/public/GEMarker1/E-construction.png b/src/renderer/public/GEMarker1/E-construction.png new file mode 100644 index 0000000..6e5f54a Binary files /dev/null and b/src/renderer/public/GEMarker1/E-construction.png differ diff --git a/src/renderer/public/GEMarker1/F-charging_pile.png b/src/renderer/public/GEMarker1/F-charging_pile.png new file mode 100644 index 0000000..70726fc Binary files /dev/null and b/src/renderer/public/GEMarker1/F-charging_pile.png differ diff --git a/src/renderer/public/GEMarker1/F-factory.png b/src/renderer/public/GEMarker1/F-factory.png new file mode 100644 index 0000000..e55d4af Binary files /dev/null and b/src/renderer/public/GEMarker1/F-factory.png differ diff --git a/src/renderer/public/GEMarker1/F-parking_lot.png b/src/renderer/public/GEMarker1/F-parking_lot.png new file mode 100644 index 0000000..bea2706 Binary files /dev/null and b/src/renderer/public/GEMarker1/F-parking_lot.png differ diff --git a/src/renderer/public/GEMarker1/F-play.png b/src/renderer/public/GEMarker1/F-play.png new file mode 100644 index 0000000..d45fee0 Binary files /dev/null and b/src/renderer/public/GEMarker1/F-play.png differ diff --git a/src/renderer/public/GEMarker1/pond.png b/src/renderer/public/GEMarker1/pond.png new file mode 100644 index 0000000..6e6ae34 Binary files /dev/null and b/src/renderer/public/GEMarker1/pond.png differ diff --git a/src/renderer/public/GEMarker1/ranger_station.png b/src/renderer/public/GEMarker1/ranger_station.png new file mode 100644 index 0000000..882e02c Binary files /dev/null and b/src/renderer/public/GEMarker1/ranger_station.png differ diff --git a/src/renderer/public/GEMarker1/rivers.png b/src/renderer/public/GEMarker1/rivers.png new file mode 100644 index 0000000..2c23edf Binary files /dev/null and b/src/renderer/public/GEMarker1/rivers.png differ diff --git a/src/renderer/public/GEMarker1/swimming.png b/src/renderer/public/GEMarker1/swimming.png new file mode 100644 index 0000000..328e135 Binary files /dev/null and b/src/renderer/public/GEMarker1/swimming.png differ diff --git a/src/renderer/public/GEMarker1s/A-Signal tower.png b/src/renderer/public/GEMarker1s/A-Signal tower.png new file mode 100644 index 0000000..f3033fe Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-Signal tower.png differ diff --git a/src/renderer/public/GEMarker1s/A-VR.png b/src/renderer/public/GEMarker1s/A-VR.png new file mode 100644 index 0000000..a8e1d42 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-VR.png differ diff --git a/src/renderer/public/GEMarker1s/A-ablu-blank.png b/src/renderer/public/GEMarker1s/A-ablu-blank.png new file mode 100644 index 0000000..957abff Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-ablu-blank.png differ diff --git a/src/renderer/public/GEMarker1s/A-airports.png b/src/renderer/public/GEMarker1s/A-airports.png new file mode 100644 index 0000000..2b60ecf Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-airports.png differ diff --git a/src/renderer/public/GEMarker1s/A-blu-circle.png b/src/renderer/public/GEMarker1s/A-blu-circle.png new file mode 100644 index 0000000..a560c00 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-blu-circle.png differ diff --git a/src/renderer/public/GEMarker1s/A-blu-square.png b/src/renderer/public/GEMarker1s/A-blu-square.png new file mode 100644 index 0000000..74bb5ef Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-blu-square.png differ diff --git a/src/renderer/public/GEMarker1s/A-blu-stars.png b/src/renderer/public/GEMarker1s/A-blu-stars.png new file mode 100644 index 0000000..6851666 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-blu-stars.png differ diff --git a/src/renderer/public/GEMarker1s/A-bus.png b/src/renderer/public/GEMarker1s/A-bus.png new file mode 100644 index 0000000..5bb6273 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-bus.png differ diff --git a/src/renderer/public/GEMarker1s/A-cabs.png b/src/renderer/public/GEMarker1s/A-cabs.png new file mode 100644 index 0000000..6e5a824 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-cabs.png differ diff --git a/src/renderer/public/GEMarker1s/A-camera1.png b/src/renderer/public/GEMarker1s/A-camera1.png new file mode 100644 index 0000000..83042b0 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-camera1.png differ diff --git a/src/renderer/public/GEMarker1s/A-ferry.png b/src/renderer/public/GEMarker1s/A-ferry.png new file mode 100644 index 0000000..ac0c003 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-ferry.png differ diff --git a/src/renderer/public/GEMarker1s/A-heliport.png b/src/renderer/public/GEMarker1s/A-heliport.png new file mode 100644 index 0000000..a476675 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-heliport.png differ diff --git a/src/renderer/public/GEMarker1s/A-homegardenbusiness.png b/src/renderer/public/GEMarker1s/A-homegardenbusiness.png new file mode 100644 index 0000000..3093242 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-homegardenbusiness.png differ diff --git a/src/renderer/public/GEMarker1s/A-location.png b/src/renderer/public/GEMarker1s/A-location.png new file mode 100644 index 0000000..c30e7b5 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-location.png differ diff --git a/src/renderer/public/GEMarker1s/A-rail.png b/src/renderer/public/GEMarker1s/A-rail.png new file mode 100644 index 0000000..48d0a72 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-rail.png differ diff --git a/src/renderer/public/GEMarker1s/A-subway.png b/src/renderer/public/GEMarker1s/A-subway.png new file mode 100644 index 0000000..6b563d9 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-subway.png differ diff --git a/src/renderer/public/GEMarker1s/A-traffic lights.png b/src/renderer/public/GEMarker1s/A-traffic lights.png new file mode 100644 index 0000000..4353f6c Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-traffic lights.png differ diff --git a/src/renderer/public/GEMarker1s/A-truck.png b/src/renderer/public/GEMarker1s/A-truck.png new file mode 100644 index 0000000..d5dcec8 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-truck.png differ diff --git a/src/renderer/public/GEMarker1s/A-water.png b/src/renderer/public/GEMarker1s/A-water.png new file mode 100644 index 0000000..0b8ecd0 Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-water.png differ diff --git a/src/renderer/public/GEMarker1s/A-wharf.png b/src/renderer/public/GEMarker1s/A-wharf.png new file mode 100644 index 0000000..b4e20eb Binary files /dev/null and b/src/renderer/public/GEMarker1s/A-wharf.png differ diff --git a/src/renderer/public/GEMarker1s/C-residential quarters.png b/src/renderer/public/GEMarker1s/C-residential quarters.png new file mode 100644 index 0000000..cbd817f Binary files /dev/null and b/src/renderer/public/GEMarker1s/C-residential quarters.png differ diff --git a/src/renderer/public/GEMarker1s/D-DefaultIcon.png b/src/renderer/public/GEMarker1s/D-DefaultIcon.png new file mode 100644 index 0000000..4ca3fd0 Binary files /dev/null and b/src/renderer/public/GEMarker1s/D-DefaultIcon.png differ diff --git a/src/renderer/public/GEMarker1s/D-earthquake.png b/src/renderer/public/GEMarker1s/D-earthquake.png new file mode 100644 index 0000000..76049b4 Binary files /dev/null and b/src/renderer/public/GEMarker1s/D-earthquake.png differ diff --git a/src/renderer/public/GEMarker1s/D-nuclear_power.png b/src/renderer/public/GEMarker1s/D-nuclear_power.png new file mode 100644 index 0000000..0fb4a8b Binary files /dev/null and b/src/renderer/public/GEMarker1s/D-nuclear_power.png differ diff --git a/src/renderer/public/GEMarker1s/D-power_transmission_tower.png b/src/renderer/public/GEMarker1s/D-power_transmission_tower.png new file mode 100644 index 0000000..63b0530 Binary files /dev/null and b/src/renderer/public/GEMarker1s/D-power_transmission_tower.png differ diff --git a/src/renderer/public/GEMarker1s/E-construction.png b/src/renderer/public/GEMarker1s/E-construction.png new file mode 100644 index 0000000..05d9e03 Binary files /dev/null and b/src/renderer/public/GEMarker1s/E-construction.png differ diff --git a/src/renderer/public/GEMarker1s/F-charging_pile.png b/src/renderer/public/GEMarker1s/F-charging_pile.png new file mode 100644 index 0000000..1b17ab7 Binary files /dev/null and b/src/renderer/public/GEMarker1s/F-charging_pile.png differ diff --git a/src/renderer/public/GEMarker1s/F-factory.png b/src/renderer/public/GEMarker1s/F-factory.png new file mode 100644 index 0000000..71adb13 Binary files /dev/null and b/src/renderer/public/GEMarker1s/F-factory.png differ diff --git a/src/renderer/public/GEMarker1s/F-parking_lot.png b/src/renderer/public/GEMarker1s/F-parking_lot.png new file mode 100644 index 0000000..6553a41 Binary files /dev/null and b/src/renderer/public/GEMarker1s/F-parking_lot.png differ diff --git a/src/renderer/public/GEMarker1s/F-play.png b/src/renderer/public/GEMarker1s/F-play.png new file mode 100644 index 0000000..c397fa0 Binary files /dev/null and b/src/renderer/public/GEMarker1s/F-play.png differ diff --git a/src/renderer/public/GEMarker1s/pond.png b/src/renderer/public/GEMarker1s/pond.png new file mode 100644 index 0000000..923a7dd Binary files /dev/null and b/src/renderer/public/GEMarker1s/pond.png differ diff --git a/src/renderer/public/GEMarker1s/ranger_station.png b/src/renderer/public/GEMarker1s/ranger_station.png new file mode 100644 index 0000000..adc3202 Binary files /dev/null and b/src/renderer/public/GEMarker1s/ranger_station.png differ diff --git a/src/renderer/public/GEMarker1s/rivers.png b/src/renderer/public/GEMarker1s/rivers.png new file mode 100644 index 0000000..78de976 Binary files /dev/null and b/src/renderer/public/GEMarker1s/rivers.png differ diff --git a/src/renderer/public/GEMarker1s/swimming.png b/src/renderer/public/GEMarker1s/swimming.png new file mode 100644 index 0000000..c7e317f Binary files /dev/null and b/src/renderer/public/GEMarker1s/swimming.png differ diff --git a/src/renderer/public/icon/PolyhedronObject.png b/src/renderer/public/icon/PolyhedronObject.png new file mode 100644 index 0000000..6d94bcb Binary files /dev/null and b/src/renderer/public/icon/PolyhedronObject.png differ diff --git a/src/renderer/public/icon/attackArrow.png b/src/renderer/public/icon/attackArrow.png new file mode 100644 index 0000000..e18927c Binary files /dev/null and b/src/renderer/public/icon/attackArrow.png differ diff --git a/src/renderer/public/icon/bim.png b/src/renderer/public/icon/bim.png new file mode 100644 index 0000000..bb74a41 Binary files /dev/null and b/src/renderer/public/icon/bim.png differ diff --git a/src/renderer/public/icon/box.png b/src/renderer/public/icon/box.png new file mode 100644 index 0000000..15c3b07 Binary files /dev/null and b/src/renderer/public/icon/box.png differ diff --git a/src/renderer/public/icon/circle.png b/src/renderer/public/icon/circle.png new file mode 100644 index 0000000..0ab4370 Binary files /dev/null and b/src/renderer/public/icon/circle.png differ diff --git a/src/renderer/public/icon/curve.png b/src/renderer/public/icon/curve.png new file mode 100644 index 0000000..776f618 Binary files /dev/null and b/src/renderer/public/icon/curve.png differ diff --git a/src/renderer/public/icon/cylinder.png b/src/renderer/public/icon/cylinder.png new file mode 100644 index 0000000..dafee81 Binary files /dev/null and b/src/renderer/public/icon/cylinder.png differ diff --git a/src/renderer/public/icon/czml.png b/src/renderer/public/icon/czml.png new file mode 100644 index 0000000..cf6a28f Binary files /dev/null and b/src/renderer/public/icon/czml.png differ diff --git a/src/renderer/public/icon/diffuseScan.png b/src/renderer/public/icon/diffuseScan.png new file mode 100644 index 0000000..3e60a8c Binary files /dev/null and b/src/renderer/public/icon/diffuseScan.png differ diff --git a/src/renderer/public/icon/diffuseScan2.png b/src/renderer/public/icon/diffuseScan2.png new file mode 100644 index 0000000..571d69d Binary files /dev/null and b/src/renderer/public/icon/diffuseScan2.png differ diff --git a/src/renderer/public/icon/ellipse.png b/src/renderer/public/icon/ellipse.png new file mode 100644 index 0000000..dff1e10 Binary files /dev/null and b/src/renderer/public/icon/ellipse.png differ diff --git a/src/renderer/public/icon/ellipsoid.png b/src/renderer/public/icon/ellipsoid.png new file mode 100644 index 0000000..b685349 Binary files /dev/null and b/src/renderer/public/icon/ellipsoid.png differ diff --git a/src/renderer/public/icon/entityWall.png b/src/renderer/public/icon/entityWall.png new file mode 100644 index 0000000..705cda4 Binary files /dev/null and b/src/renderer/public/icon/entityWall.png differ diff --git a/src/renderer/public/icon/explosion.png b/src/renderer/public/icon/explosion.png new file mode 100644 index 0000000..5e88da0 Binary files /dev/null and b/src/renderer/public/icon/explosion.png differ diff --git a/src/renderer/public/icon/file.png b/src/renderer/public/icon/file.png new file mode 100644 index 0000000..55057f0 Binary files /dev/null and b/src/renderer/public/icon/file.png differ diff --git a/src/renderer/public/icon/filePdf.png b/src/renderer/public/icon/filePdf.png new file mode 100644 index 0000000..4a51206 Binary files /dev/null and b/src/renderer/public/icon/filePdf.png differ diff --git a/src/renderer/public/icon/fire.png b/src/renderer/public/icon/fire.png new file mode 100644 index 0000000..43788e8 Binary files /dev/null and b/src/renderer/public/icon/fire.png differ diff --git a/src/renderer/public/icon/flyLine.png b/src/renderer/public/icon/flyLine.png new file mode 100644 index 0000000..958b14e Binary files /dev/null and b/src/renderer/public/icon/flyLine.png differ diff --git a/src/renderer/public/icon/fountain.png b/src/renderer/public/icon/fountain.png new file mode 100644 index 0000000..686ac75 Binary files /dev/null and b/src/renderer/public/icon/fountain.png differ diff --git a/src/renderer/public/icon/gdb.png b/src/renderer/public/icon/gdb.png new file mode 100644 index 0000000..eed672a Binary files /dev/null and b/src/renderer/public/icon/gdb.png differ diff --git a/src/renderer/public/icon/gengon.png b/src/renderer/public/icon/gengon.png new file mode 100644 index 0000000..a5c09d0 Binary files /dev/null and b/src/renderer/public/icon/gengon.png differ diff --git a/src/renderer/public/icon/geojson.png b/src/renderer/public/icon/geojson.png new file mode 100644 index 0000000..a661820 Binary files /dev/null and b/src/renderer/public/icon/geojson.png differ diff --git a/src/renderer/public/icon/groundImage.png b/src/renderer/public/icon/groundImage.png new file mode 100644 index 0000000..6f41870 Binary files /dev/null and b/src/renderer/public/icon/groundImage.png differ diff --git a/src/renderer/public/icon/groundText.png b/src/renderer/public/icon/groundText.png new file mode 100644 index 0000000..a0433d4 Binary files /dev/null and b/src/renderer/public/icon/groundText.png differ diff --git a/src/renderer/public/icon/ground_image.png b/src/renderer/public/icon/ground_image.png new file mode 100644 index 0000000..6f41870 Binary files /dev/null and b/src/renderer/public/icon/ground_image.png differ diff --git a/src/renderer/public/icon/kml.png b/src/renderer/public/icon/kml.png new file mode 100644 index 0000000..e0d6ef1 Binary files /dev/null and b/src/renderer/public/icon/kml.png differ diff --git a/src/renderer/public/icon/layer.png b/src/renderer/public/icon/layer.png new file mode 100644 index 0000000..978b68a Binary files /dev/null and b/src/renderer/public/icon/layer.png differ diff --git a/src/renderer/public/icon/line.png b/src/renderer/public/icon/line.png new file mode 100644 index 0000000..776f618 Binary files /dev/null and b/src/renderer/public/icon/line.png differ diff --git a/src/renderer/public/icon/lineDrawing.png b/src/renderer/public/icon/lineDrawing.png new file mode 100644 index 0000000..b64d28e Binary files /dev/null and b/src/renderer/public/icon/lineDrawing.png differ diff --git a/src/renderer/public/icon/linkImage.png b/src/renderer/public/icon/linkImage.png new file mode 100644 index 0000000..f988596 Binary files /dev/null and b/src/renderer/public/icon/linkImage.png differ diff --git a/src/renderer/public/icon/model.png b/src/renderer/public/icon/model.png new file mode 100644 index 0000000..2790e01 Binary files /dev/null and b/src/renderer/public/icon/model.png differ diff --git a/src/renderer/public/icon/model_press.png b/src/renderer/public/icon/model_press.png new file mode 100644 index 0000000..989d471 Binary files /dev/null and b/src/renderer/public/icon/model_press.png differ diff --git a/src/renderer/public/icon/panel.png b/src/renderer/public/icon/panel.png new file mode 100644 index 0000000..1707c84 Binary files /dev/null and b/src/renderer/public/icon/panel.png differ diff --git a/src/renderer/public/icon/path.png b/src/renderer/public/icon/path.png new file mode 100644 index 0000000..4011163 Binary files /dev/null and b/src/renderer/public/icon/path.png differ diff --git a/src/renderer/public/icon/pincerArrow.png b/src/renderer/public/icon/pincerArrow.png new file mode 100644 index 0000000..3d7e66e Binary files /dev/null and b/src/renderer/public/icon/pincerArrow.png differ diff --git a/src/renderer/public/icon/point.png b/src/renderer/public/icon/point.png new file mode 100644 index 0000000..a0256bc Binary files /dev/null and b/src/renderer/public/icon/point.png differ diff --git a/src/renderer/public/icon/polygon.png b/src/renderer/public/icon/polygon.png new file mode 100644 index 0000000..1707c84 Binary files /dev/null and b/src/renderer/public/icon/polygon.png differ diff --git a/src/renderer/public/icon/polyline.png b/src/renderer/public/icon/polyline.png new file mode 100644 index 0000000..776f618 Binary files /dev/null and b/src/renderer/public/icon/polyline.png differ diff --git a/src/renderer/public/icon/pressModel.png b/src/renderer/public/icon/pressModel.png new file mode 100644 index 0000000..ffec04e Binary files /dev/null and b/src/renderer/public/icon/pressModel.png differ diff --git a/src/renderer/public/icon/probe_icon.png b/src/renderer/public/icon/probe_icon.png new file mode 100644 index 0000000..d0aca6e Binary files /dev/null and b/src/renderer/public/icon/probe_icon.png differ diff --git a/src/renderer/public/icon/radarScan (2).png b/src/renderer/public/icon/radarScan (2).png new file mode 100644 index 0000000..d7464d8 Binary files /dev/null and b/src/renderer/public/icon/radarScan (2).png differ diff --git a/src/renderer/public/icon/radarScan.png b/src/renderer/public/icon/radarScan.png new file mode 100644 index 0000000..b2620bf Binary files /dev/null and b/src/renderer/public/icon/radarScan.png differ diff --git a/src/renderer/public/icon/rectangle.png b/src/renderer/public/icon/rectangle.png new file mode 100644 index 0000000..c92056f Binary files /dev/null and b/src/renderer/public/icon/rectangle.png differ diff --git a/src/renderer/public/icon/rehearsal.png b/src/renderer/public/icon/rehearsal.png new file mode 100644 index 0000000..076bd11 Binary files /dev/null and b/src/renderer/public/icon/rehearsal.png differ diff --git a/src/renderer/public/icon/rendezvous.png b/src/renderer/public/icon/rendezvous.png new file mode 100644 index 0000000..8776d0f Binary files /dev/null and b/src/renderer/public/icon/rendezvous.png differ diff --git a/src/renderer/public/icon/road.png b/src/renderer/public/icon/road.png new file mode 100644 index 0000000..8789347 Binary files /dev/null and b/src/renderer/public/icon/road.png differ diff --git a/src/renderer/public/icon/roam.png b/src/renderer/public/icon/roam.png new file mode 100644 index 0000000..521d1c8 Binary files /dev/null and b/src/renderer/public/icon/roam.png differ diff --git a/src/renderer/public/icon/scanStereoscopic.png b/src/renderer/public/icon/scanStereoscopic.png new file mode 100644 index 0000000..8294639 Binary files /dev/null and b/src/renderer/public/icon/scanStereoscopic.png differ diff --git a/src/renderer/public/icon/sector.png b/src/renderer/public/icon/sector.png new file mode 100644 index 0000000..b1e8d31 Binary files /dev/null and b/src/renderer/public/icon/sector.png differ diff --git a/src/renderer/public/icon/sensor_icon.png b/src/renderer/public/icon/sensor_icon.png new file mode 100644 index 0000000..3a7cf54 Binary files /dev/null and b/src/renderer/public/icon/sensor_icon.png differ diff --git a/src/renderer/public/icon/shp.png b/src/renderer/public/icon/shp.png new file mode 100644 index 0000000..6be284a Binary files /dev/null and b/src/renderer/public/icon/shp.png differ diff --git a/src/renderer/public/icon/smoke.png b/src/renderer/public/icon/smoke.png new file mode 100644 index 0000000..3241941 Binary files /dev/null and b/src/renderer/public/icon/smoke.png differ diff --git a/src/renderer/public/icon/standText.png b/src/renderer/public/icon/standText.png new file mode 100644 index 0000000..e9dbb26 Binary files /dev/null and b/src/renderer/public/icon/standText.png differ diff --git a/src/renderer/public/icon/stand_text.png b/src/renderer/public/icon/stand_text.png new file mode 100644 index 0000000..e9dbb26 Binary files /dev/null and b/src/renderer/public/icon/stand_text.png differ diff --git a/src/renderer/public/icon/terrain - 副本.png b/src/renderer/public/icon/terrain - 副本.png new file mode 100644 index 0000000..fee403e Binary files /dev/null and b/src/renderer/public/icon/terrain - 副本.png differ diff --git a/src/renderer/public/icon/terrain.png b/src/renderer/public/icon/terrain.png new file mode 100644 index 0000000..fee403e Binary files /dev/null and b/src/renderer/public/icon/terrain.png differ diff --git a/src/renderer/public/icon/terrainDig.png b/src/renderer/public/icon/terrainDig.png new file mode 100644 index 0000000..1f3f5bc Binary files /dev/null and b/src/renderer/public/icon/terrainDig.png differ diff --git a/src/renderer/public/icon/textBox.png b/src/renderer/public/icon/textBox.png new file mode 100644 index 0000000..a59620a Binary files /dev/null and b/src/renderer/public/icon/textBox.png differ diff --git a/src/renderer/public/icon/tileset.png b/src/renderer/public/icon/tileset.png new file mode 100644 index 0000000..bb74a41 Binary files /dev/null and b/src/renderer/public/icon/tileset.png differ diff --git a/src/renderer/public/icon/trajectory.png b/src/renderer/public/icon/trajectory.png new file mode 100644 index 0000000..c15f2a5 Binary files /dev/null and b/src/renderer/public/icon/trajectory.png differ diff --git a/src/renderer/public/icon/vrImage.png b/src/renderer/public/icon/vrImage.png new file mode 100644 index 0000000..6f70cf0 Binary files /dev/null and b/src/renderer/public/icon/vrImage.png differ diff --git a/src/renderer/public/icon/wallStereoscopic.png b/src/renderer/public/icon/wallStereoscopic.png new file mode 100644 index 0000000..5d1b1d4 Binary files /dev/null and b/src/renderer/public/icon/wallStereoscopic.png differ diff --git a/src/renderer/public/icon/water.png b/src/renderer/public/icon/water.png new file mode 100644 index 0000000..9460f2e Binary files /dev/null and b/src/renderer/public/icon/water.png differ diff --git a/src/renderer/public/icon/water_flow.png b/src/renderer/public/icon/water_flow.png new file mode 100644 index 0000000..fba2021 Binary files /dev/null and b/src/renderer/public/icon/water_flow.png differ diff --git a/src/renderer/public/icon/waterl.png b/src/renderer/public/icon/waterl.png new file mode 100644 index 0000000..fba2021 Binary files /dev/null and b/src/renderer/public/icon/waterl.png differ diff --git a/src/renderer/public/icon/xlsx.png b/src/renderer/public/icon/xlsx.png new file mode 100644 index 0000000..55057f0 Binary files /dev/null and b/src/renderer/public/icon/xlsx.png differ diff --git a/src/renderer/public/icon/yanmo.png b/src/renderer/public/icon/yanmo.png new file mode 100644 index 0000000..757e275 Binary files /dev/null and b/src/renderer/public/icon/yanmo.png differ diff --git a/src/renderer/public/tank.glb b/src/renderer/public/tank.glb new file mode 100644 index 0000000..aaccdf0 Binary files /dev/null and b/src/renderer/public/tank.glb differ diff --git a/src/renderer/src/axios/index.ts b/src/renderer/src/axios/index.ts index ad41bff..13433e3 100644 --- a/src/renderer/src/axios/index.ts +++ b/src/renderer/src/axios/index.ts @@ -15,6 +15,7 @@ if (window && window.process && window.process.type === 'renderer') { } else { baseURL = 'http://192.168.110.25:8848' } +localStorage.setItem('service', baseURL) // 创建自定义配置的axios实例 const service: AxiosInstance = axios.create({ diff --git a/src/renderer/src/common/addMapSource.ts b/src/renderer/src/common/addMapSource.ts index c296bab..223a0d2 100644 --- a/src/renderer/src/common/addMapSource.ts +++ b/src/renderer/src/common/addMapSource.ts @@ -6,7 +6,7 @@ export const addMapSource = async ({ type, id, sourceName = '未命名对象', o if (!id) { id = new YJ.Tools().randomString() } - let options: any = await initMapData(type, opt) + let options: any = await initMapData(type, opt, null) let selectedNodes = window.treeObj.getSelectedNodes() let node = selectedNodes && selectedNodes[selectedNodes.length - 1] let parentId diff --git a/src/renderer/src/common/initMapData.ts b/src/renderer/src/common/initMapData.ts index 324336a..61bf5b4 100644 --- a/src/renderer/src/common/initMapData.ts +++ b/src/renderer/src/common/initMapData.ts @@ -1,14 +1,8 @@ import { leftClick, rightClick } from '../../src/views/components/tree/entityClick' -export const initMapData = async (type, data) => { +export const initMapData = async (type, data, cd) => { let entityObject let options - let baseURL - if (window && window.process && window.process.type === 'renderer') { - // baseURL = localStorage.getItem('ip') ||'http://192.168.110.25:8848'|| 'http://127.0.0.1:8808' - baseURL = 'http://127.0.0.1:8848' - } else { - baseURL = 'http://192.168.110.25:8848' - } + let baseURL = localStorage.getItem('service') switch (type) { case 'groundText': entityObject = new YJ.Obj.GroundText(window.earth, data) @@ -20,7 +14,7 @@ export const initMapData = async (type, data) => { case 'linkImage': case 'vrImage': entityObject = new YJ.Obj.BillboardObject(window.earth, data) - entityObject.options.billboard.defaultImage = '' + // entityObject.options.billboard.defaultImage = '' break case 'line': entityObject = await new YJ.Obj.PolylineObject(window.earth, data) @@ -62,8 +56,10 @@ export const initMapData = async (type, data) => { case 'tileset': data.host = baseURL entityObject = new YJ.Obj.Tileset(window.earth, data) - entityObject.load((res) => { + if (cd) { + cd(entityObject) + } // 等模型加载完后再加载压平模型 Array.from((window as any).pressModelMap.keys()).forEach((key: any) => { if (key.indexOf("_" + data.id) > -1) { @@ -98,6 +94,18 @@ export const initMapData = async (type, data) => { case 'radarScan': entityObject = new YJ.Obj.RadarScan(window.earth, data) break + case 'scanStereoscopic': + entityObject = new YJ.Obj.RadarScanStereoscopic(window.earth, data) + break + case 'textBox': + entityObject = new YJ.Obj.TextBox(window.earth, data) + break + case 'polyhedronObject': + entityObject = new YJ.Obj.PolyhedronObject(window.earth, data) + break + case 'water': + entityObject = new YJ.Obj.WaterSurface(window.earth, data) + break default: break } @@ -105,6 +113,13 @@ export const initMapData = async (type, data) => { if (entityObject) { options = structuredClone(entityObject.options) delete options.host + switch (type) { + case 'textBox': + delete options.name + break + default: + break + } //鼠标左键点击事件 entityObject.onClick = () => { leftClick(options); diff --git a/src/renderer/src/components/dialog/baseDialog.vue b/src/renderer/src/components/dialog/baseDialog.vue index e624dcf..0c6f77f 100644 --- a/src/renderer/src/components/dialog/baseDialog.vue +++ b/src/renderer/src/components/dialog/baseDialog.vue @@ -7,6 +7,8 @@ :style="{ width: width, height: height, + top: top, + left: left, position: fix ? 'fixed' : 'absolute' }" v-if="dialogVisible" @@ -126,11 +128,11 @@ const open = (data) => { }) } dialogVisible.value = true - nextTick(() => { - setTimeout(() => { - openPosition() - }, 0) - }) + // nextTick(() => { + // setTimeout(() => { + // openPosition() + // }, 0) + // }) } const close = () => { diff --git a/src/renderer/src/components/dialog/directory.vue b/src/renderer/src/components/dialog/directory.vue index 5840aa3..8055fc6 100644 --- a/src/renderer/src/components/dialog/directory.vue +++ b/src/renderer/src/components/dialog/directory.vue @@ -72,7 +72,7 @@ const add = throttle(async () => { const node = { ...res.data } - let addNode = cusAddNodes(window.treeObj, getSelectedNode(window.treeObj), [node], true) //添加节点 + let addNode = await cusAddNodes(window.treeObj, getSelectedNode(window.treeObj), [node], true) //添加节点 //获取该节点下的同级节点 const someNode: any = getSameLevel(window.treeObj, addNode[0]) const newNode = someNode.map((item: any) => { diff --git a/src/renderer/src/icons/svg/BIMEdit.svg b/src/renderer/src/icons/svg/BIMEdit.svg new file mode 100644 index 0000000..7078ac3 --- /dev/null +++ b/src/renderer/src/icons/svg/BIMEdit.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/Intervisibility.svg b/src/renderer/src/icons/svg/Intervisibility.svg new file mode 100644 index 0000000..b4dc818 --- /dev/null +++ b/src/renderer/src/icons/svg/Intervisibility.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/annotation.svg b/src/renderer/src/icons/svg/annotation.svg new file mode 100644 index 0000000..6fe6dc0 --- /dev/null +++ b/src/renderer/src/icons/svg/annotation.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/renderer/src/icons/svg/annotationAggregation.svg b/src/renderer/src/icons/svg/annotationAggregation.svg new file mode 100644 index 0000000..5a241fd --- /dev/null +++ b/src/renderer/src/icons/svg/annotationAggregation.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/areaScreen.svg b/src/renderer/src/icons/svg/areaScreen.svg new file mode 100644 index 0000000..65c9cd6 --- /dev/null +++ b/src/renderer/src/icons/svg/areaScreen.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/circleStatistics.svg b/src/renderer/src/icons/svg/circleStatistics.svg new file mode 100644 index 0000000..8aa29d7 --- /dev/null +++ b/src/renderer/src/icons/svg/circleStatistics.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/renderer/src/icons/svg/clearGraffiti.svg b/src/renderer/src/icons/svg/clearGraffiti.svg new file mode 100644 index 0000000..176b16c --- /dev/null +++ b/src/renderer/src/icons/svg/clearGraffiti.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/clearQuery.svg b/src/renderer/src/icons/svg/clearQuery.svg new file mode 100644 index 0000000..af5eda6 --- /dev/null +++ b/src/renderer/src/icons/svg/clearQuery.svg @@ -0,0 +1,19 @@ + + + + + + + diff --git a/src/renderer/src/icons/svg/clearRoute.svg b/src/renderer/src/icons/svg/clearRoute.svg new file mode 100644 index 0000000..d236d8a --- /dev/null +++ b/src/renderer/src/icons/svg/clearRoute.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/clearTilesetClipping.svg b/src/renderer/src/icons/svg/clearTilesetClipping.svg new file mode 100644 index 0000000..f15341b --- /dev/null +++ b/src/renderer/src/icons/svg/clearTilesetClipping.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/coorLocation.svg b/src/renderer/src/icons/svg/coorLocation.svg new file mode 100644 index 0000000..5fc2634 --- /dev/null +++ b/src/renderer/src/icons/svg/coorLocation.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/floodSimulation.svg b/src/renderer/src/icons/svg/floodSimulation.svg new file mode 100644 index 0000000..7df3f79 --- /dev/null +++ b/src/renderer/src/icons/svg/floodSimulation.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/gdbImport.svg b/src/renderer/src/icons/svg/gdbImport.svg new file mode 100644 index 0000000..eb9d8d1 --- /dev/null +++ b/src/renderer/src/icons/svg/gdbImport.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/graffiti.svg b/src/renderer/src/icons/svg/graffiti.svg new file mode 100644 index 0000000..cd193e0 --- /dev/null +++ b/src/renderer/src/icons/svg/graffiti.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/highQuality.svg b/src/renderer/src/icons/svg/highQuality.svg new file mode 100644 index 0000000..43123b7 --- /dev/null +++ b/src/renderer/src/icons/svg/highQuality.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/renderer/src/icons/svg/importImg.svg b/src/renderer/src/icons/svg/importImg.svg new file mode 100644 index 0000000..cbcb4e2 --- /dev/null +++ b/src/renderer/src/icons/svg/importImg.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/importPanorama.svg b/src/renderer/src/icons/svg/importPanorama.svg new file mode 100644 index 0000000..03e87ce --- /dev/null +++ b/src/renderer/src/icons/svg/importPanorama.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/mouseLocation.svg b/src/renderer/src/icons/svg/mouseLocation.svg index ad46589..b52b454 100644 --- a/src/renderer/src/icons/svg/mouseLocation.svg +++ b/src/renderer/src/icons/svg/mouseLocation.svg @@ -1,4 +1,11 @@ - - - + + + + + diff --git a/src/renderer/src/icons/svg/path.svg b/src/renderer/src/icons/svg/path.svg new file mode 100644 index 0000000..e8b4645 --- /dev/null +++ b/src/renderer/src/icons/svg/path.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/peopleRoomLink.svg b/src/renderer/src/icons/svg/peopleRoomLink.svg new file mode 100644 index 0000000..280bc5a --- /dev/null +++ b/src/renderer/src/icons/svg/peopleRoomLink.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/perspective.svg b/src/renderer/src/icons/svg/perspective.svg new file mode 100644 index 0000000..003dc09 --- /dev/null +++ b/src/renderer/src/icons/svg/perspective.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/pictureLocation.svg b/src/renderer/src/icons/svg/pictureLocation.svg new file mode 100644 index 0000000..367685a --- /dev/null +++ b/src/renderer/src/icons/svg/pictureLocation.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/polygonStatistics.svg b/src/renderer/src/icons/svg/polygonStatistics.svg new file mode 100644 index 0000000..95ce6d0 --- /dev/null +++ b/src/renderer/src/icons/svg/polygonStatistics.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/pressModel.svg b/src/renderer/src/icons/svg/pressModel.svg new file mode 100644 index 0000000..95f5a87 --- /dev/null +++ b/src/renderer/src/icons/svg/pressModel.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/projConvert.svg b/src/renderer/src/icons/svg/projConvert.svg new file mode 100644 index 0000000..5461b46 --- /dev/null +++ b/src/renderer/src/icons/svg/projConvert.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/renderer/src/icons/svg/projectionConvert.svg b/src/renderer/src/icons/svg/projectionConvert.svg new file mode 100644 index 0000000..a59b820 --- /dev/null +++ b/src/renderer/src/icons/svg/projectionConvert.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/rangeQuery.svg b/src/renderer/src/icons/svg/rangeQuery.svg new file mode 100644 index 0000000..f30d218 --- /dev/null +++ b/src/renderer/src/icons/svg/rangeQuery.svg @@ -0,0 +1,21 @@ + + + + + + + diff --git a/src/renderer/src/icons/svg/routePlan.svg b/src/renderer/src/icons/svg/routePlan.svg new file mode 100644 index 0000000..450d94d --- /dev/null +++ b/src/renderer/src/icons/svg/routePlan.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/screenShot.svg b/src/renderer/src/icons/svg/screenShot.svg new file mode 100644 index 0000000..c4d402a --- /dev/null +++ b/src/renderer/src/icons/svg/screenShot.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/tacticalCalculation.svg b/src/renderer/src/icons/svg/tacticalCalculation.svg new file mode 100644 index 0000000..1e606a6 --- /dev/null +++ b/src/renderer/src/icons/svg/tacticalCalculation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/terrainDig.svg b/src/renderer/src/icons/svg/terrainDig.svg new file mode 100644 index 0000000..7df4461 --- /dev/null +++ b/src/renderer/src/icons/svg/terrainDig.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/tilesetClipping.svg b/src/renderer/src/icons/svg/tilesetClipping.svg new file mode 100644 index 0000000..e2a8bab --- /dev/null +++ b/src/renderer/src/icons/svg/tilesetClipping.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/transform.svg b/src/renderer/src/icons/svg/transform.svg new file mode 100644 index 0000000..6003dc0 --- /dev/null +++ b/src/renderer/src/icons/svg/transform.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/src/renderer/src/icons/svg/videoRecord.svg b/src/renderer/src/icons/svg/videoRecord.svg new file mode 100644 index 0000000..5c03e92 --- /dev/null +++ b/src/renderer/src/icons/svg/videoRecord.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/renderer/src/main.ts b/src/renderer/src/main.ts index 9f314e0..9671205 100644 --- a/src/renderer/src/main.ts +++ b/src/renderer/src/main.ts @@ -25,6 +25,7 @@ import '../public/tree/jquery.ztree.exhide.js' import '../public/tree/fuzzysearch.js' import '../public/tree/newFuzzySearch' import Pagination from './components/Pagination/index.vue' + // process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true"; const i18n = createI18n({ legacy: false, diff --git a/src/renderer/src/views/components/assets/images/titlebg.png b/src/renderer/src/views/components/assets/images/titlebg.png new file mode 100644 index 0000000..c7b9607 Binary files /dev/null and b/src/renderer/src/views/components/assets/images/titlebg.png differ diff --git a/src/renderer/src/views/components/leftSide/leftSideSecond.vue b/src/renderer/src/views/components/leftSide/leftSideSecond.vue index dcb7497..e483e64 100644 --- a/src/renderer/src/views/components/leftSide/leftSideSecond.vue +++ b/src/renderer/src/views/components/leftSide/leftSideSecond.vue @@ -3,14 +3,11 @@
@@ -32,6 +29,7 @@ import { } from '@/utils/communication' import { ElMessage, ElLoading } from 'element-plus' import dayjs from 'dayjs' +const { ipcRenderer } = require('electron') const { t } = useI18n() const { findParentId, findTreeIndex, cusAddNodes } = useTreeNode() const fs = require('fs') @@ -88,7 +86,8 @@ window.addEventListener('keydown', handleKeyDown) const methodMap = { // 轨迹运动 - trajectoryMotion: () => { + trajectoryMotion: async() => { + let availablePort = await ipcRenderer.invoke('get-available-port'); let draw = new YJ.Draw.DrawPolyline(window.earth) draw.start(async (err, positions) => { if (positions && positions.length > 1) { @@ -103,7 +102,7 @@ const methodMap = { name: name, model: { show: true, - url: 'http://localhost:5173/tank.glb' + url: `http://localhost:${availablePort}/tank.glb` }, line: { show: true, @@ -162,6 +161,7 @@ const methodMap = { } }) }, + // 雷达光波 diffusedLightWave: () => { let draw = new YJ.Draw.DrawCircle(window.earth) draw.start((err, options) => { @@ -184,6 +184,78 @@ const methodMap = { } }) }, + // 立体雷达扫描 + scanStereoscopic: () => { + let draw = new YJ.Draw.DrawCircle(window.earth) + draw.start((err, options) => { + if (options) { + let id = new YJ.Tools().randomString() + let name = '立体雷达扫描' + addMapSource({ + type: 'scanStereoscopic', + id: id, + sourceName: name, + opt: { + id: id, + name: name, + lng: options.center.lng, + lat: options.center.lat, + alt: options.center.alt, + radius: options.radius + } + }) + } + }) + }, + // 多面体 + multilateralBody: () => { + let draw = new YJ.Draw.DrawPolygon(window.earth) + draw.start((err, positions) => { + if (!positions || positions.length < 3) { + ElMessage({ + message: '至少需要绘制三个坐标!', + type: 'warning' + }) + return + } + let id = new YJ.Tools().randomString() + let name = '多面体' + addMapSource({ + type: 'polyhedronObject', + id: id, + sourceName: name, + opt: { + id: id, + name: name, + positions: positions + } + }) + }) + }, + waterSurface: () => { + let draw = new YJ.Draw.DrawPolygon(window.earth) + draw.start((err, positions) => { + if (!positions || positions.length < 3) { + ElMessage({ + message: '至少需要绘制三个坐标!', + type: 'warning' + }) + return + } + let id = new YJ.Tools().randomString() + let name = '水面' + addMapSource({ + type: 'water', + id: id, + sourceName: name, + opt: { + id: id, + name: name, + positions: positions + } + }) + }) + }, //投影面积 projectionArea: () => { new YJ.Measure.MeasureTyArea(window.earth).start() @@ -336,7 +408,7 @@ const methodMap = { filters: [{ name: '保存图片', extensions: ['jpg'] }] }) $recvElectronChanel('selectedFileItem', (e, path) => { - fs.writeFile(path, dataBuffer, (res) => {}) + fs.writeFile(path, dataBuffer, (res) => { }) }) } @@ -470,11 +542,11 @@ const methodMap = { TreeApi.addOtherSource(paramsData) paramsData.isShow = true paramsData.params = JSON.stringify(paramsData.params) - ;(window as any).pressModelMap.set(id + '_' + selectedNode.id, paramsData) - ;(window as any).pressModelEntities.set(id, flat) + ; (window as any).pressModelMap.set(id + '_' + selectedNode.id, paramsData) + ; (window as any).pressModelEntities.set(id, flat) cusAddNodes(window.treeObj, paramsData.parentId, [paramsData]) // //鼠标右键点击事件 - flat.onRightClick = () => {} + flat.onRightClick = () => { } // _entityMap.set(node.source_id, flat) } else { // this.$message.warning('至少三个点') @@ -552,7 +624,7 @@ const methodMap = { eventBus.emit('ProjectionConvertDialog') }, //GDB导入 - gdbImport() {}, + gdbImport() { }, //圆形统计 circleStatistics() { if ((window as any).checkAuthIsValid) { diff --git a/src/renderer/src/views/components/propertyBox/CoorLocation.vue b/src/renderer/src/views/components/propertyBox/CoorLocation.vue index 8458fa5..5da8a26 100644 --- a/src/renderer/src/views/components/propertyBox/CoorLocation.vue +++ b/src/renderer/src/views/components/propertyBox/CoorLocation.vue @@ -247,7 +247,7 @@ const flyto = async (e) => { } } if (!window.earth.entityMap.get(id.value)) { - await initMapData('point', params) + await initMapData('point', params, null) } // switch (activeName.value) { // case 'first': diff --git a/src/renderer/src/views/components/propertyBox/addGroundText.vue b/src/renderer/src/views/components/propertyBox/addGroundText.vue index e0d340c..35f97c5 100644 --- a/src/renderer/src/views/components/propertyBox/addGroundText.vue +++ b/src/renderer/src/views/components/propertyBox/addGroundText.vue @@ -42,7 +42,7 @@ const confirm = () => { id: id, text: name, positions: positions - }) + }, null) delete options.host delete options.positions let selectedNodes = window.treeObj.getSelectedNodes() diff --git a/src/renderer/src/views/components/propertyBox/addStandText.vue b/src/renderer/src/views/components/propertyBox/addStandText.vue index 3f753d2..411f3e6 100644 --- a/src/renderer/src/views/components/propertyBox/addStandText.vue +++ b/src/renderer/src/views/components/propertyBox/addStandText.vue @@ -42,7 +42,7 @@ const confirm = () => { id: id, name: name, positions: positions - }) + }, null) delete options.host console.log('options', options) let selectedNodes = window.treeObj.getSelectedNodes() diff --git a/src/renderer/src/views/components/propertyBox/attribute.vue b/src/renderer/src/views/components/propertyBox/attribute.vue index 164d7a3..3551407 100644 --- a/src/renderer/src/views/components/propertyBox/attribute.vue +++ b/src/renderer/src/views/components/propertyBox/attribute.vue @@ -211,7 +211,10 @@ const props = defineProps({ }) const attribute = ref(props.entityOptions.options.attribute) -props.entityOptions.options.richTextContent = '' +if(!props.entityOptions.options.richTextContent) +{ + props.entityOptions.options.richTextContent = '' +} const richTextContent = ref(props.entityOptions.options.richTextContent) let attributeSelect = ref([ diff --git a/src/renderer/src/views/components/propertyBox/billboardObject.vue b/src/renderer/src/views/components/propertyBox/billboardObject.vue index c732206..89a88f4 100644 --- a/src/renderer/src/views/components/propertyBox/billboardObject.vue +++ b/src/renderer/src/views/components/propertyBox/billboardObject.vue @@ -762,10 +762,10 @@ const close = () => { } const clickChangeImage = () => { - eventBus?.emit('openImageSelect') + eventBus?.emit('openSelectImg', entityOptions.value.billboardImage, entityOptions.value) } const clickChangeDefaultImage = () => { - eventBus?.emit('openImageSelect') + eventBus?.emit('openSelectImg', entityOptions.value.billboardDefaultImage, entityOptions.value) } const fontChange = (val) => { entityOptions.value.labelFontFamily = val diff --git a/src/renderer/src/views/components/propertyBox/polyhedronObject.vue b/src/renderer/src/views/components/propertyBox/polyhedronObject.vue new file mode 100644 index 0000000..1d222ac --- /dev/null +++ b/src/renderer/src/views/components/propertyBox/polyhedronObject.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue b/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue new file mode 100644 index 0000000..31b0a83 --- /dev/null +++ b/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue @@ -0,0 +1,240 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/components/propertyBox/tileset.vue b/src/renderer/src/views/components/propertyBox/tileset.vue index 67909df..a03b941 100644 --- a/src/renderer/src/views/components/propertyBox/tileset.vue +++ b/src/renderer/src/views/components/propertyBox/tileset.vue @@ -121,12 +121,17 @@ const close = () => { baseDialog.value?.close() } const rotate = () => { - that.rotationEditing = true + that.rotationEditing = !that.rotationEditing } const translate = () => { - that.openPositionEditing(()=>{ - entityOptions.value.height = entityOptions.value.height - }) + if(that.positionEditing) { + that.closePositionEditing() + } + else { + that.openPositionEditing(()=>{ + entityOptions.value.height = entityOptions.value.height + }) + } } const remove = () => { close() diff --git a/src/renderer/src/views/components/propertyBox/waterSurface.vue b/src/renderer/src/views/components/propertyBox/waterSurface.vue new file mode 100644 index 0000000..79fe8a3 --- /dev/null +++ b/src/renderer/src/views/components/propertyBox/waterSurface.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/components/selectImg/index.vue b/src/renderer/src/views/components/selectImg/index.vue index ceac7a4..60e75c7 100644 --- a/src/renderer/src/views/components/selectImg/index.vue +++ b/src/renderer/src/views/components/selectImg/index.vue @@ -1,7 +1,8 @@