diff --git a/electron-builder.yml b/electron-builder.yml index 128a86b..3c0413c 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -7,6 +7,11 @@ files: - 'out/**/*' - 'package.json' - 'resources/**/*' + - '!resources/java/app/license/*' + - '!resources/java/app/lib/*' + - '!resources/java/app/logs/*' + - '!resources/java/app/poi/*' + - '!resources/java/app/upload/*' - '!node_modules/**/*' - '!**/.vscode/*' - '!src/*' @@ -41,6 +46,7 @@ nsis: perMachine: true allowToChangeInstallationDirectory: true language: "2052" + deleteAppDataOnUninstall: true mac: entitlementsInherit: build/entitlements.mac.plist extendInfo: diff --git a/install.txt b/install.txt index 88c9fe5..567f182 100644 --- a/install.txt +++ b/install.txt @@ -6,4 +6,18 @@ SetRegView 32 WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "installurl" WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "installurl" +!macroend + +!macro customUnInstall + SetRegView 64 + DeleteRegKey HKLM "${INSTALL_REGISTRY_KEY}" ; + DeleteRegKey HKCU "${INSTALL_REGISTRY_KEY}" ; + SetRegView 32 + DeleteRegKey HKLM "${INSTALL_REGISTRY_KEY}" + DeleteRegKey HKCU "${INSTALL_REGISTRY_KEY}" + + Delete "$APPDATA\${APP_ID}\*.*" + RMDir /r "$APPDATA\${APP_ID}" + Delete "$LOCALAPPDATA\${APP_ID}\*.*" + RMDir /r "$LOCALAPPDATA\${APP_ID}" !macroend \ No newline at end of file diff --git a/installer.nsh b/installer.nsh index 7ae1b15..0b4cafa 100644 --- a/installer.nsh +++ b/installer.nsh @@ -1,9 +1,9 @@ !macro preInit SetRegView 64 - 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" + WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES\${APP_ID}" + WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES\${APP_ID}" #writeUninstaller $INSTDIR\uninstaller.exe SetRegView 32 - 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 + WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES\${APP_ID}" + WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES\${APP_ID}" +!macroend diff --git a/resources/java/app/application.yml b/resources/java/app/application.yml index 41e4c70..09039c9 100644 --- a/resources/java/app/application.yml +++ b/resources/java/app/application.yml @@ -1,7 +1,7 @@ server: host: 127.0.0.1 port: 8848 - path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save + path: C:\Users\takeshita\AppData\Roaming\dzsp_shijingjun_offline_Y_save poi: global: enabled: false diff --git a/resources/java/app/upload/0123c218d3f448e3bf0b32e2efed801e b/resources/java/app/upload/0123c218d3f448e3bf0b32e2efed801e deleted file mode 100644 index 4026e29..0000000 Binary files a/resources/java/app/upload/0123c218d3f448e3bf0b32e2efed801e and /dev/null differ diff --git a/resources/java/app/upload/033b9092110c478797b9b1cdb9b40de3.jpg b/resources/java/app/upload/033b9092110c478797b9b1cdb9b40de3.jpg deleted file mode 100644 index 56d2c0b..0000000 Binary files a/resources/java/app/upload/033b9092110c478797b9b1cdb9b40de3.jpg and /dev/null differ diff --git a/resources/java/app/upload/08f0721a0d8e48ae83b8de6e8b6c1e75.jpg b/resources/java/app/upload/08f0721a0d8e48ae83b8de6e8b6c1e75.jpg deleted file mode 100644 index 54449ae..0000000 Binary files a/resources/java/app/upload/08f0721a0d8e48ae83b8de6e8b6c1e75.jpg and /dev/null differ diff --git a/resources/java/app/upload/09e23d89ad5f4bd6a52645d309592d75.png b/resources/java/app/upload/09e23d89ad5f4bd6a52645d309592d75.png deleted file mode 100644 index 931aeca..0000000 Binary files a/resources/java/app/upload/09e23d89ad5f4bd6a52645d309592d75.png and /dev/null differ diff --git a/resources/java/app/upload/0c67c2ad328042ea948dc48ec03b3f57.JPG b/resources/java/app/upload/0c67c2ad328042ea948dc48ec03b3f57.JPG deleted file mode 100644 index f9594f1..0000000 Binary files a/resources/java/app/upload/0c67c2ad328042ea948dc48ec03b3f57.JPG and /dev/null differ diff --git a/resources/java/app/upload/0dfbbc0422724d22887fea1d00d86a5c.pbf b/resources/java/app/upload/0dfbbc0422724d22887fea1d00d86a5c.pbf deleted file mode 100644 index 3e7246c..0000000 Binary files a/resources/java/app/upload/0dfbbc0422724d22887fea1d00d86a5c.pbf and /dev/null differ diff --git a/resources/java/app/upload/100161d302f44a659f3abfc0adb0038c.jpg b/resources/java/app/upload/100161d302f44a659f3abfc0adb0038c.jpg deleted file mode 100644 index 54449ae..0000000 Binary files a/resources/java/app/upload/100161d302f44a659f3abfc0adb0038c.jpg and /dev/null differ diff --git a/resources/java/app/upload/1062975692f646a6982a367e8f13935f.jpg b/resources/java/app/upload/1062975692f646a6982a367e8f13935f.jpg deleted file mode 100644 index 56d2c0b..0000000 Binary files a/resources/java/app/upload/1062975692f646a6982a367e8f13935f.jpg and /dev/null differ diff --git a/resources/java/app/upload/12c436c4cad549b1b38eff2568550ee1.jpg b/resources/java/app/upload/12c436c4cad549b1b38eff2568550ee1.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/12c436c4cad549b1b38eff2568550ee1.jpg and /dev/null differ diff --git a/resources/java/app/upload/18bcbb8043094c4181e8744ae7a84de9.JPG b/resources/java/app/upload/18bcbb8043094c4181e8744ae7a84de9.JPG deleted file mode 100644 index a7f8dc6..0000000 Binary files a/resources/java/app/upload/18bcbb8043094c4181e8744ae7a84de9.JPG and /dev/null differ diff --git a/resources/java/app/upload/1e08f64aa77d404bb3f1de555dc6a0ac.JPG b/resources/java/app/upload/1e08f64aa77d404bb3f1de555dc6a0ac.JPG deleted file mode 100644 index f9594f1..0000000 Binary files a/resources/java/app/upload/1e08f64aa77d404bb3f1de555dc6a0ac.JPG and /dev/null differ diff --git a/resources/java/app/upload/232aff2ab0554ef1907b6ecbd21af1c1.glb b/resources/java/app/upload/232aff2ab0554ef1907b6ecbd21af1c1.glb deleted file mode 100644 index 253fc95..0000000 Binary files a/resources/java/app/upload/232aff2ab0554ef1907b6ecbd21af1c1.glb and /dev/null differ diff --git a/resources/java/app/upload/257fff4cff71496db00e40fef3487ac4.jpg b/resources/java/app/upload/257fff4cff71496db00e40fef3487ac4.jpg deleted file mode 100644 index 6e2f971..0000000 Binary files a/resources/java/app/upload/257fff4cff71496db00e40fef3487ac4.jpg and /dev/null differ diff --git a/resources/java/app/upload/281f3835d5ff4bff9f531b51dd39448f.png b/resources/java/app/upload/281f3835d5ff4bff9f531b51dd39448f.png deleted file mode 100644 index 3584ba7..0000000 Binary files a/resources/java/app/upload/281f3835d5ff4bff9f531b51dd39448f.png and /dev/null differ diff --git a/resources/java/app/upload/2c8f6ff66541480e93361a73708c16e2.jpg b/resources/java/app/upload/2c8f6ff66541480e93361a73708c16e2.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/2c8f6ff66541480e93361a73708c16e2.jpg and /dev/null differ diff --git a/resources/java/app/upload/2dded9e561a742f88d3a04ad11540053.jpg b/resources/java/app/upload/2dded9e561a742f88d3a04ad11540053.jpg deleted file mode 100644 index 56d2c0b..0000000 Binary files a/resources/java/app/upload/2dded9e561a742f88d3a04ad11540053.jpg and /dev/null differ diff --git a/resources/java/app/upload/330d8f72f895485290d0b408fa707f81.jpg b/resources/java/app/upload/330d8f72f895485290d0b408fa707f81.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/330d8f72f895485290d0b408fa707f81.jpg and /dev/null differ diff --git a/resources/java/app/upload/34122ee24c33423480f0c9385a8f4b9c.glb b/resources/java/app/upload/34122ee24c33423480f0c9385a8f4b9c.glb deleted file mode 100644 index 253fc95..0000000 Binary files a/resources/java/app/upload/34122ee24c33423480f0c9385a8f4b9c.glb and /dev/null differ diff --git a/resources/java/app/upload/35558ef8c236475cb56d1aaa723d53ab.glb b/resources/java/app/upload/35558ef8c236475cb56d1aaa723d53ab.glb deleted file mode 100644 index f56b8d5..0000000 Binary files a/resources/java/app/upload/35558ef8c236475cb56d1aaa723d53ab.glb and /dev/null differ diff --git a/resources/java/app/upload/3baf5da7c6154a8c8ff0b2cbb919451f.JPG b/resources/java/app/upload/3baf5da7c6154a8c8ff0b2cbb919451f.JPG deleted file mode 100644 index a7f8dc6..0000000 Binary files a/resources/java/app/upload/3baf5da7c6154a8c8ff0b2cbb919451f.JPG and /dev/null differ diff --git a/resources/java/app/upload/3fc40e256c7f4cefa3cc5cca84d20d2b.jpg b/resources/java/app/upload/3fc40e256c7f4cefa3cc5cca84d20d2b.jpg deleted file mode 100644 index 4386554..0000000 Binary files a/resources/java/app/upload/3fc40e256c7f4cefa3cc5cca84d20d2b.jpg and /dev/null differ diff --git a/resources/java/app/upload/41ade62b36904aa1b77b6ae450cd08b2.JPG b/resources/java/app/upload/41ade62b36904aa1b77b6ae450cd08b2.JPG deleted file mode 100644 index f389f18..0000000 Binary files a/resources/java/app/upload/41ade62b36904aa1b77b6ae450cd08b2.JPG and /dev/null differ diff --git a/resources/java/app/upload/43c814039f4a4b2985c3c103bb49b666 b/resources/java/app/upload/43c814039f4a4b2985c3c103bb49b666 deleted file mode 100644 index def93cf..0000000 Binary files a/resources/java/app/upload/43c814039f4a4b2985c3c103bb49b666 and /dev/null differ diff --git a/resources/java/app/upload/4467466a337943cbb94190d837ee05f6 b/resources/java/app/upload/4467466a337943cbb94190d837ee05f6 deleted file mode 100644 index 981d28c..0000000 Binary files a/resources/java/app/upload/4467466a337943cbb94190d837ee05f6 and /dev/null differ diff --git a/resources/java/app/upload/474d50b295b043aea8b71c09ecfc3fe6.jpg b/resources/java/app/upload/474d50b295b043aea8b71c09ecfc3fe6.jpg deleted file mode 100644 index 56d2c0b..0000000 Binary files a/resources/java/app/upload/474d50b295b043aea8b71c09ecfc3fe6.jpg and /dev/null differ diff --git a/resources/java/app/upload/478fb67eaa91490fbe6cdc488f7415bf.jpg b/resources/java/app/upload/478fb67eaa91490fbe6cdc488f7415bf.jpg deleted file mode 100644 index 54449ae..0000000 Binary files a/resources/java/app/upload/478fb67eaa91490fbe6cdc488f7415bf.jpg and /dev/null differ diff --git a/resources/java/app/upload/4b59dad7d85c4da0b57dc6e3e44de559.JPG b/resources/java/app/upload/4b59dad7d85c4da0b57dc6e3e44de559.JPG deleted file mode 100644 index f9594f1..0000000 Binary files a/resources/java/app/upload/4b59dad7d85c4da0b57dc6e3e44de559.JPG and /dev/null differ diff --git a/resources/java/app/upload/4baa689f69c34736b601f52a9362e4c7.JPG b/resources/java/app/upload/4baa689f69c34736b601f52a9362e4c7.JPG deleted file mode 100644 index 9144105..0000000 Binary files a/resources/java/app/upload/4baa689f69c34736b601f52a9362e4c7.JPG and /dev/null differ diff --git a/resources/java/app/upload/532778a977564f62a0f2d83a998a9fc4.jpg b/resources/java/app/upload/532778a977564f62a0f2d83a998a9fc4.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/532778a977564f62a0f2d83a998a9fc4.jpg and /dev/null differ diff --git a/resources/java/app/upload/53c0ec558ae74fcd867d4aa26caf4737.pbf b/resources/java/app/upload/53c0ec558ae74fcd867d4aa26caf4737.pbf deleted file mode 100644 index c720ba9..0000000 Binary files a/resources/java/app/upload/53c0ec558ae74fcd867d4aa26caf4737.pbf and /dev/null differ diff --git a/resources/java/app/upload/5da68b3196b046a494888c122c8f1978.JPG b/resources/java/app/upload/5da68b3196b046a494888c122c8f1978.JPG deleted file mode 100644 index f389f18..0000000 Binary files a/resources/java/app/upload/5da68b3196b046a494888c122c8f1978.JPG and /dev/null differ diff --git a/resources/java/app/upload/61fd16a0bb1b46d6a2aaf7e1c877547d.jpg b/resources/java/app/upload/61fd16a0bb1b46d6a2aaf7e1c877547d.jpg deleted file mode 100644 index 4386554..0000000 Binary files a/resources/java/app/upload/61fd16a0bb1b46d6a2aaf7e1c877547d.jpg and /dev/null differ diff --git a/resources/java/app/upload/691cbca45f2b40ac92194a0f4a3c8512.jpg b/resources/java/app/upload/691cbca45f2b40ac92194a0f4a3c8512.jpg deleted file mode 100644 index ace57b8..0000000 Binary files a/resources/java/app/upload/691cbca45f2b40ac92194a0f4a3c8512.jpg and /dev/null differ diff --git a/resources/java/app/upload/6c9a4dded45443208d6351863643648b.JPG b/resources/java/app/upload/6c9a4dded45443208d6351863643648b.JPG deleted file mode 100644 index 4286973..0000000 Binary files a/resources/java/app/upload/6c9a4dded45443208d6351863643648b.JPG and /dev/null differ diff --git a/resources/java/app/upload/6f4b0752eca94b60911ebc13c0d020cf.JPG b/resources/java/app/upload/6f4b0752eca94b60911ebc13c0d020cf.JPG deleted file mode 100644 index d3f9423..0000000 Binary files a/resources/java/app/upload/6f4b0752eca94b60911ebc13c0d020cf.JPG and /dev/null differ diff --git a/resources/java/app/upload/702b03455ae24f4aaa04cbaed17d6c29.jpg b/resources/java/app/upload/702b03455ae24f4aaa04cbaed17d6c29.jpg deleted file mode 100644 index 54449ae..0000000 Binary files a/resources/java/app/upload/702b03455ae24f4aaa04cbaed17d6c29.jpg and /dev/null differ diff --git a/resources/java/app/upload/71b4ddc5ac6745c489478a6274ab7321.JPG b/resources/java/app/upload/71b4ddc5ac6745c489478a6274ab7321.JPG deleted file mode 100644 index da481d2..0000000 Binary files a/resources/java/app/upload/71b4ddc5ac6745c489478a6274ab7321.JPG and /dev/null differ diff --git a/resources/java/app/upload/720df0f8ca5743dd9c9babb5e22c4f54.jpg b/resources/java/app/upload/720df0f8ca5743dd9c9babb5e22c4f54.jpg deleted file mode 100644 index 4386554..0000000 Binary files a/resources/java/app/upload/720df0f8ca5743dd9c9babb5e22c4f54.jpg and /dev/null differ diff --git a/resources/java/app/upload/75d897267dc9491d8255b498dd44edfb.jpg b/resources/java/app/upload/75d897267dc9491d8255b498dd44edfb.jpg deleted file mode 100644 index 4386554..0000000 Binary files a/resources/java/app/upload/75d897267dc9491d8255b498dd44edfb.jpg and /dev/null differ diff --git a/resources/java/app/upload/7631415789d7434f9638a385a11b0dbf.JPG b/resources/java/app/upload/7631415789d7434f9638a385a11b0dbf.JPG deleted file mode 100644 index 47c8c40..0000000 Binary files a/resources/java/app/upload/7631415789d7434f9638a385a11b0dbf.JPG and /dev/null differ diff --git a/resources/java/app/upload/80a9b3701a25480b9c731db92501015a.jpg b/resources/java/app/upload/80a9b3701a25480b9c731db92501015a.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/80a9b3701a25480b9c731db92501015a.jpg and /dev/null differ diff --git a/resources/java/app/upload/8286f6b52f254884af601447ca13a1d5.JPG b/resources/java/app/upload/8286f6b52f254884af601447ca13a1d5.JPG deleted file mode 100644 index 32fbef3..0000000 Binary files a/resources/java/app/upload/8286f6b52f254884af601447ca13a1d5.JPG and /dev/null differ diff --git a/resources/java/app/upload/8464131a67894b11bf142b37c574a91f b/resources/java/app/upload/8464131a67894b11bf142b37c574a91f deleted file mode 100644 index a9c42c9..0000000 Binary files a/resources/java/app/upload/8464131a67894b11bf142b37c574a91f and /dev/null differ diff --git a/resources/java/app/upload/8e515835140c4128b0ae4451e18dde81.JPG b/resources/java/app/upload/8e515835140c4128b0ae4451e18dde81.JPG deleted file mode 100644 index 9144105..0000000 Binary files a/resources/java/app/upload/8e515835140c4128b0ae4451e18dde81.JPG and /dev/null differ diff --git a/resources/java/app/upload/8ea517aa085f4979a6edafe754a4dbe6.jpg b/resources/java/app/upload/8ea517aa085f4979a6edafe754a4dbe6.jpg deleted file mode 100644 index 4386554..0000000 Binary files a/resources/java/app/upload/8ea517aa085f4979a6edafe754a4dbe6.jpg and /dev/null differ diff --git a/resources/java/app/upload/907bc53ebfd04f9b9c6212b22a533b86.jpg b/resources/java/app/upload/907bc53ebfd04f9b9c6212b22a533b86.jpg deleted file mode 100644 index 4386554..0000000 Binary files a/resources/java/app/upload/907bc53ebfd04f9b9c6212b22a533b86.jpg and /dev/null differ diff --git a/resources/java/app/upload/a6be98ea6a2d47ecad60786f1a2e1751.jpg b/resources/java/app/upload/a6be98ea6a2d47ecad60786f1a2e1751.jpg deleted file mode 100644 index 4386554..0000000 Binary files a/resources/java/app/upload/a6be98ea6a2d47ecad60786f1a2e1751.jpg and /dev/null differ diff --git a/resources/java/app/upload/ab5d72cbcf0b45e580588e74f92b592a.jpg b/resources/java/app/upload/ab5d72cbcf0b45e580588e74f92b592a.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/ab5d72cbcf0b45e580588e74f92b592a.jpg and /dev/null differ diff --git a/resources/java/app/upload/ad823c4046704e1c84eb37797d1d844b.jpg b/resources/java/app/upload/ad823c4046704e1c84eb37797d1d844b.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/ad823c4046704e1c84eb37797d1d844b.jpg and /dev/null differ diff --git a/resources/java/app/upload/afbad7b36e784bcdaf8ce099022ada48.jpg b/resources/java/app/upload/afbad7b36e784bcdaf8ce099022ada48.jpg deleted file mode 100644 index 54449ae..0000000 Binary files a/resources/java/app/upload/afbad7b36e784bcdaf8ce099022ada48.jpg and /dev/null differ diff --git a/resources/java/app/upload/b1ffe201bf2e4438b0644573c89e61c8.JPG b/resources/java/app/upload/b1ffe201bf2e4438b0644573c89e61c8.JPG deleted file mode 100644 index 4286973..0000000 Binary files a/resources/java/app/upload/b1ffe201bf2e4438b0644573c89e61c8.JPG and /dev/null differ diff --git a/resources/java/app/upload/b22ecf1de04348c687ab284a64b02696.jpg b/resources/java/app/upload/b22ecf1de04348c687ab284a64b02696.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/b22ecf1de04348c687ab284a64b02696.jpg and /dev/null differ diff --git a/resources/java/app/upload/b2e8b37fb9d34150b32285196f1c4ed2.pbf b/resources/java/app/upload/b2e8b37fb9d34150b32285196f1c4ed2.pbf deleted file mode 100644 index 77ba2c5..0000000 Binary files a/resources/java/app/upload/b2e8b37fb9d34150b32285196f1c4ed2.pbf and /dev/null differ diff --git a/resources/java/app/upload/b7d8a392f4ae448f9e6ea5d8d53c7960.jpg b/resources/java/app/upload/b7d8a392f4ae448f9e6ea5d8d53c7960.jpg deleted file mode 100644 index 4386554..0000000 Binary files a/resources/java/app/upload/b7d8a392f4ae448f9e6ea5d8d53c7960.jpg and /dev/null differ diff --git a/resources/java/app/upload/ba5a9fe7d09f4b63b4fde841dff4c48e.jpg b/resources/java/app/upload/ba5a9fe7d09f4b63b4fde841dff4c48e.jpg deleted file mode 100644 index 56d2c0b..0000000 Binary files a/resources/java/app/upload/ba5a9fe7d09f4b63b4fde841dff4c48e.jpg and /dev/null differ diff --git a/resources/java/app/upload/bb04d60627c741f99a4e4d463ec8fbe9.glb b/resources/java/app/upload/bb04d60627c741f99a4e4d463ec8fbe9.glb deleted file mode 100644 index 253fc95..0000000 Binary files a/resources/java/app/upload/bb04d60627c741f99a4e4d463ec8fbe9.glb and /dev/null differ diff --git a/resources/java/app/upload/bfba71b1d9834395a9f78d8139414c75.jpg b/resources/java/app/upload/bfba71b1d9834395a9f78d8139414c75.jpg deleted file mode 100644 index ace57b8..0000000 Binary files a/resources/java/app/upload/bfba71b1d9834395a9f78d8139414c75.jpg and /dev/null differ diff --git a/resources/java/app/upload/c22545152fe947f5be5e90644eee4947.jpg b/resources/java/app/upload/c22545152fe947f5be5e90644eee4947.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/c22545152fe947f5be5e90644eee4947.jpg and /dev/null differ diff --git a/resources/java/app/upload/c977d56bc876462aabe4e65787f26772.jpg b/resources/java/app/upload/c977d56bc876462aabe4e65787f26772.jpg deleted file mode 100644 index 56d2c0b..0000000 Binary files a/resources/java/app/upload/c977d56bc876462aabe4e65787f26772.jpg and /dev/null differ diff --git a/resources/java/app/upload/cb10be40f66d4ad09f542fbb2e340cc0 b/resources/java/app/upload/cb10be40f66d4ad09f542fbb2e340cc0 deleted file mode 100644 index bdb5bce..0000000 Binary files a/resources/java/app/upload/cb10be40f66d4ad09f542fbb2e340cc0 and /dev/null differ diff --git a/resources/java/app/upload/cfa5bd609fea44e28d0e8c46950612cc.JPG b/resources/java/app/upload/cfa5bd609fea44e28d0e8c46950612cc.JPG deleted file mode 100644 index 19b8ad3..0000000 Binary files a/resources/java/app/upload/cfa5bd609fea44e28d0e8c46950612cc.JPG and /dev/null differ diff --git a/resources/java/app/upload/d64ca57a83674bf1a94e7e6d33610700.glb b/resources/java/app/upload/d64ca57a83674bf1a94e7e6d33610700.glb deleted file mode 100644 index f56b8d5..0000000 Binary files a/resources/java/app/upload/d64ca57a83674bf1a94e7e6d33610700.glb and /dev/null differ diff --git a/resources/java/app/upload/d7b05fc0252841049e0dd75e877e86fa.jpg b/resources/java/app/upload/d7b05fc0252841049e0dd75e877e86fa.jpg deleted file mode 100644 index 56d2c0b..0000000 Binary files a/resources/java/app/upload/d7b05fc0252841049e0dd75e877e86fa.jpg and /dev/null differ diff --git a/resources/java/app/upload/d9d820f53cc241db80fc2be0a1fabcd7.JPG b/resources/java/app/upload/d9d820f53cc241db80fc2be0a1fabcd7.JPG deleted file mode 100644 index 32fbef3..0000000 Binary files a/resources/java/app/upload/d9d820f53cc241db80fc2be0a1fabcd7.JPG and /dev/null differ diff --git a/resources/java/app/upload/e093ba97f3884e6ab10c8748201d2aef.jpg b/resources/java/app/upload/e093ba97f3884e6ab10c8748201d2aef.jpg deleted file mode 100644 index dfdaa33..0000000 Binary files a/resources/java/app/upload/e093ba97f3884e6ab10c8748201d2aef.jpg and /dev/null differ diff --git a/resources/java/app/upload/e09548231eda4389b4702163ee67fff6 b/resources/java/app/upload/e09548231eda4389b4702163ee67fff6 deleted file mode 100644 index 981d28c..0000000 Binary files a/resources/java/app/upload/e09548231eda4389b4702163ee67fff6 and /dev/null differ diff --git a/resources/java/app/upload/f22548bb50774cc3bfe3ef39be48c428.pbf b/resources/java/app/upload/f22548bb50774cc3bfe3ef39be48c428.pbf deleted file mode 100644 index 9e19108..0000000 Binary files a/resources/java/app/upload/f22548bb50774cc3bfe3ef39be48c428.pbf and /dev/null differ diff --git a/resources/java/app/upload/f6cbc3ded9f14158a9bc6d6d84a82e76.JPG b/resources/java/app/upload/f6cbc3ded9f14158a9bc6d6d84a82e76.JPG deleted file mode 100644 index da481d2..0000000 Binary files a/resources/java/app/upload/f6cbc3ded9f14158a9bc6d6d84a82e76.JPG and /dev/null differ diff --git a/resources/java/app/upload/fb1b35f596c54768be0bf319eaac27c1.pbf b/resources/java/app/upload/fb1b35f596c54768be0bf319eaac27c1.pbf deleted file mode 100644 index 01918dc..0000000 Binary files a/resources/java/app/upload/fb1b35f596c54768be0bf319eaac27c1.pbf and /dev/null differ diff --git a/resources/java/app/upload/fe52021b10ce4a79a9f01c441f02b659 b/resources/java/app/upload/fe52021b10ce4a79a9f01c441f02b659 deleted file mode 100644 index dc69cb0..0000000 Binary files a/resources/java/app/upload/fe52021b10ce4a79a9f01c441f02b659 and /dev/null differ diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts index 37cb211..257698b 100644 --- a/src/renderer/components.d.ts +++ b/src/renderer/components.d.ts @@ -23,6 +23,7 @@ declare module 'vue' { ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] diff --git a/src/renderer/public/sdk/custom/css/index.css b/src/renderer/public/sdk/custom/css/index.css index a3893dc..04faf54 100644 --- a/src/renderer/public/sdk/custom/css/index.css +++ b/src/renderer/public/sdk/custom/css/index.css @@ -49,6 +49,10 @@ --color-text-shadow: rgba(20, 118, 255, 1); } +/* .cesium-viewer.\32 d{ + opacity: 0; +} */ + .cesium-viewer-cesiumWidgetContainer { position: relative; } @@ -171,8 +175,12 @@ .YJ-custom-base-dialog button:not(button[disabled]):hover { border-color: rgba(var(--color-base1), 1) !important; + color: rgba(var(--color-base1), 1) !important; cursor: pointer; } +.YJ-custom-base-dialog button:not(button[disabled]):hover svg { + fill: rgba(var(--color-base1), 1) !important; +} .YJ-custom-base-dialog button:focus-visible { outline: none; @@ -279,6 +287,10 @@ padding: 0px 24px; } +.YJ-custom-base-dialog>.content .el-tabs .el-tabs__header { + margin-bottom: 0; +} + .YJ-custom-base-dialog>.content .div-item { /* border-top: 1px solid rgba(204, 204, 204, 0.2); */ padding: 12px 0; @@ -473,6 +485,9 @@ .YJ-custom-base-dialog>.content .table .table-body .tr:first-child { border-top: none; } +.YJ-custom-base-dialog>.content .table .table-body .tr:last-child { + border-bottom: 1px solid rgba(var(--color-base1), 0.5); +} .YJ-custom-base-dialog>.content .table .table-empty { display: flex; @@ -1772,7 +1787,7 @@ /* 轨迹运动 */ .YJ-custom-base-dialog.trajectory-motion>.content { - width: 550px; + width: 562px; } .YJ-custom-base-dialog.trajectory-motion>.content .div-item>.row>.col { @@ -1801,6 +1816,10 @@ .YJ-custom-base-dialog.trajectory-motion>.content .btn.is-active { border-color: rgba(var(--color-base1)); + color: rgba(var(--color-base1)); +} +.YJ-custom-base-dialog.trajectory-motion>.content .btn.is-active svg { + fill: rgba(var(--color-base1)); } .YJ-custom-base-dialog.trajectory-motion>.content .btn-group .btn.is-active>span { @@ -1826,7 +1845,6 @@ .YJ-custom-base-dialog.trajectory-motion>.content .icon-rubric { width: 16px; height: 16px; - margin-left: 12px; } .YJ-custom-base-dialog.trajectory-motion>.content .custom__popper__arrow::after { diff --git a/src/renderer/public/tree/jquery.ztree.core.js b/src/renderer/public/tree/jquery.ztree.core.js index de322c6..12cc1f4 100644 --- a/src/renderer/public/tree/jquery.ztree.core.js +++ b/src/renderer/public/tree/jquery.ztree.core.js @@ -1492,7 +1492,6 @@ html.push('') }, makeDOMNodeNameBefore: function (html, setting, node) { - console.log('=================', setting, node) var title = data.nodeTitle(setting, node), url = view.makeNodeUrl(setting, node), fontcss = view.makeNodeFontCss(setting, node), diff --git a/src/renderer/src/I18n/zh-CN.ts b/src/renderer/src/I18n/zh-CN.ts index 1064a0d..ef51b9e 100644 --- a/src/renderer/src/I18n/zh-CN.ts +++ b/src/renderer/src/I18n/zh-CN.ts @@ -21,7 +21,7 @@ export default { pictureLocation: '带定位照片', importPanorama: '带定位全景', addBIM: '添加BIM', - edit: '编辑节点', + edit: '图层属性', del: '删除节点', setView: '设置视角', resetView: '重置视角', @@ -249,6 +249,7 @@ export default { 视野缩放: '视野缩放', 最近距离: '最近距离', 最远距离: '最远距离', + 基础信息: '基础信息', 属性信息: '属性信息', 空间信息: '空间信息', 标注风格: '标注风格', diff --git a/src/renderer/src/I18n/zh-EN.ts b/src/renderer/src/I18n/zh-EN.ts index b5b23c2..77eeebf 100644 --- a/src/renderer/src/I18n/zh-EN.ts +++ b/src/renderer/src/I18n/zh-EN.ts @@ -20,7 +20,7 @@ export default { pictureLocation: 'add photo data', importPanorama: 'add panoramic data', addBIM: 'add BIM', - edit: 'edit Node', + edit: 'Properties', del: 'delete Node', setView: 'set View', resetView: 'reset View', @@ -248,6 +248,7 @@ export default { 视野缩放: 'Field of view zoom', 最近距离: 'Shortest distance', 最远距离: 'Farthest distance', + 基础信息: 'Basic info', 属性信息: 'Attribute', 空间信息: 'Spatial info', 标注风格: 'Mark style', diff --git a/src/renderer/src/I18n/zh-TW.ts b/src/renderer/src/I18n/zh-TW.ts index cf352fb..23816a9 100644 --- a/src/renderer/src/I18n/zh-TW.ts +++ b/src/renderer/src/I18n/zh-TW.ts @@ -20,7 +20,7 @@ export default { pictureLocation: '帶定位照片', importPanorama: '帶定位全景', addBIM: '添加BIM', - edit: '編輯節點', + edit: '圖層屬性', del: '刪除節點', setView: '設置視角', resetView: '重置視角', @@ -247,6 +247,7 @@ export default { 视野缩放: '視野縮放', 最近距离: '最近距離', 最远距离: '最遠距離', + 基础信息: '基礎信息', 属性信息: '屬性信息', 空间信息: '空間信息', 标注风格: '標注風格', diff --git a/src/renderer/src/api/ts/index.ts b/src/renderer/src/api/ts/index.ts index 40cdfad..9eddf0b 100644 --- a/src/renderer/src/api/ts/index.ts +++ b/src/renderer/src/api/ts/index.ts @@ -27,6 +27,7 @@ export const TsApi = { data }) }, + delPlan: async (data: any) => { return await request.post({ url: '/tsPlan/delete', @@ -45,6 +46,19 @@ export const TsApi = { data }) }, + //树的隐藏显示 + updateTreeShow: async (data: any) => { + let datas = [] + data.forEach(item => { + let obj = {id: item.id, show: item.isShow} + // @ts-ignore + datas.push(obj) + }) + return await request.post({ + url: `/tsSource/batchUpdateShowStatus`, + data: datas + }) + }, ///tsSource/addModelSource addTsModelSource: async (data: any) => { return await request.post({ diff --git a/src/renderer/src/assets/styles/global.css b/src/renderer/src/assets/styles/global.css index d97689f..357782a 100644 --- a/src/renderer/src/assets/styles/global.css +++ b/src/renderer/src/assets/styles/global.css @@ -426,7 +426,6 @@ img { .ztree li span.button.switch { margin-right: 5px; } - #app { .ztree * { font-size: 14px; @@ -438,6 +437,9 @@ img { margin-bottom: 6px; } + .ztree .checkbox_false_full + a,.ztree .checkbox_false_full_focus + a { + color: #d7d7d7; + } .ztree li a.curSelectedNode { background-color: #ffffff00; border: none; @@ -683,6 +685,18 @@ img { } } +@media (max-width: 1640px) { + #app .left .menus .menus_itemBox .item_text { + font-size: 1rem; + } +} + +@media (max-width: 1450px) { + #app .left .menus .menus_itemBox .item_text { + font-size: 0.9rem; + } +} + /* 提示 */ /* .el-message--info { diff --git a/src/renderer/src/common/initMapData.ts b/src/renderer/src/common/initMapData.ts index 6195ee6..b082221 100644 --- a/src/renderer/src/common/initMapData.ts +++ b/src/renderer/src/common/initMapData.ts @@ -1,5 +1,8 @@ import { leftClick, rightClick } from '../../src/views/components/tree/entityClick' import { renderVector } from '../views/components/tree/components/hooks/renderVector' +import { TreeApi } from '@/api/tree' +import { useTreeNode } from '@/views/components/tree/hooks/treeNode' +const { cusUpdateNode } = useTreeNode() export const initMapData = async (type, data, cd) => { let entityObject @@ -115,6 +118,18 @@ export const initMapData = async (type, data, cd) => { }) break case 'path': + data.customView = { + "orientation": { + "heading": 0.7281022757737154, + "pitch": -40.42354263534561, + "roll": 0.00021604950860490326 + }, + "relativePosition": { + "lng": 0.0002095400000001746, + "lat": -0.000447990000001397, + "alt": 45.65 + } + } entityObject = new YJ.Obj.TrajectoryMotion(window.earth, data) break case 'wallStereoscopic': @@ -196,7 +211,7 @@ export const initMapData = async (type, data, cd) => { console.log('--------------------onClick') //鼠标左键点击事件 entityObject.onClick = () => { - // console.log('onClick') + console.log('onClick') leftClick(getOptions()); }; //鼠标右键点击事件 @@ -204,6 +219,24 @@ export const initMapData = async (type, data, cd) => { rightClick(getOptions()); }; + // 文本框回调 + if(type === 'textBox') { + entityObject.callback = (options) => { + let params = structuredClone(options) + let sourceName = '文本框' + delete params.name + delete params.host + let params2 = { + id: params.id, + sourceName:sourceName, + params: params, + isShow: params.show ? 1 : 0 + } + TreeApi.updateDirectoryInfo(params2) + cusUpdateNode({ id: params.id, sourceName: sourceName, params: JSON.stringify(params) }) + } + } + if (entityObject.options.id) { (window as any)._entityMap.set(entityObject.options.id, entityObject) } diff --git a/src/renderer/src/icons/svg/del.svg b/src/renderer/src/icons/svg/del.svg index 969722f..43e07fb 100644 --- a/src/renderer/src/icons/svg/del.svg +++ b/src/renderer/src/icons/svg/del.svg @@ -1,17 +1 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/edit.svg b/src/renderer/src/icons/svg/edit.svg index 69d48f2..f73d87d 100644 --- a/src/renderer/src/icons/svg/edit.svg +++ b/src/renderer/src/icons/svg/edit.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/layerRaise.svg b/src/renderer/src/icons/svg/layerRaise.svg index c6c0c30..8c15eaa 100644 --- a/src/renderer/src/icons/svg/layerRaise.svg +++ b/src/renderer/src/icons/svg/layerRaise.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/renderer/src/utils/index.ts b/src/renderer/src/utils/index.ts index 8fb54fa..2a8ea1f 100644 --- a/src/renderer/src/utils/index.ts +++ b/src/renderer/src/utils/index.ts @@ -67,7 +67,7 @@ export function getNamefromPath(path) { } export function handleInputLimit(e) { - if (e.data === '-') { + if (e.data === '-' || e.data === '.') { } else { e.target.value = e.target.value || 0 diff --git a/src/renderer/src/views/TS/cabin.vue b/src/renderer/src/views/TS/cabin.vue index b0a016d..23cf2f8 100644 --- a/src/renderer/src/views/TS/cabin.vue +++ b/src/renderer/src/views/TS/cabin.vue @@ -157,7 +157,8 @@ const initTreeCallBack = () => { if (!detail && !params) { detail = { id: arr[i].id, - name: arr[i].sourceName + name: arr[i].sourceName, + isShow: arr[i].isShow } } layers.push( @@ -168,7 +169,7 @@ const initTreeCallBack = () => { ) } else { console.log({...detail, ...params}) - initMapData(arr[i].sourceType, {...detail, ...params}) + initMapData(arr[i].sourceType, {...detail, ...params},) } } @@ -195,7 +196,9 @@ const initTreeCallBack = () => { }); if ((window as any).earth_ts) { for (let i = 0; i < layers.length; i++) { - initMapData(layers[i].sourceType, layers[i].detail, null) + initMapData(layers[i].sourceType, layers[i].detail, (layer) => { + layer.show = Boolean(layers[i].isShow) + }) } } }) @@ -232,7 +235,7 @@ const onClick = (event: MouseEvent, treeId: string, treeNode: any) => { * @param treeId * @param treeNode */ -const onCheck = (event: any, treeId: any, treeNode: any) => { +const onCheck = async (event: any, treeId: any, treeNode: any) => { console.log(treeNode, 'treeNode') let p_ids: any = [] let parentNode = treeNode.getParentNode(); @@ -262,7 +265,7 @@ const onCheck = (event: any, treeId: any, treeNode: any) => { p_ids.push( { id: parentNode.id, - isShow: 0 + isShow: 0, } ) window['treeObj'].checkNode(parentNode, false, true); @@ -270,7 +273,7 @@ const onCheck = (event: any, treeId: any, treeNode: any) => { p_ids.push( { id: parentNode.id, - isShow: 1 + isShow: 1, } ) } @@ -286,7 +289,7 @@ const onCheck = (event: any, treeId: any, treeNode: any) => { function sourceStatus(node) { if (canCheckType.includes(node.sourceType)) { - ids.push({id: node.id, isShow: node.isShow ? 1 : 0}) + ids.push({id: node.id, isShow: node.isShow ? 1 : 0,}) console.log(node) let entityObject entityObject = (window as any)._entityMap.get(node.id) @@ -308,6 +311,18 @@ const onCheck = (event: any, treeId: any, treeNode: any) => { sourceStatus(treeNode) console.log("ids", ids) + const res = await TsApi.updateTreeShow(ids) + if (res.code == 0 || res.code == 200) { + ElMessage({ + message: '操作成功', + type: 'success' + }) + } else { + ElMessage({ + message: '操作失败', + type: 'error' + }) + } } const onMouseDown = (event: MouseEvent, treeId: string, treeNode: any) => { console.log("onMouseDown") diff --git a/src/renderer/src/views/TS/components/timeScale.vue b/src/renderer/src/views/TS/components/timeScale.vue index 2f428d9..e035cc4 100644 --- a/src/renderer/src/views/TS/components/timeScale.vue +++ b/src/renderer/src/views/TS/components/timeScale.vue @@ -1,6 +1,6 @@