解决冲突

CYZZ-master/cyzz/web_cyzz/yarn.lock

@@ -2127,6 +2127,11 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
+clone@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
+
 coa@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmmirror.com/coa/-/coa-2.0.2.tgz"
@@ -3440,6 +3445,11 @@ functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   resolved "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+geographiclib-geodesic@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmmirror.com/geographiclib-geodesic/-/geographiclib-geodesic-2.1.1.tgz#5f9c02f2e0db5403055ba637f76d9e58b2215863"
+  integrity sha512-lkd8EUkPSByobWu9BPMHTdYA5AUZxOa8McmUNtBE9KrvUJEvSADnN6gTDmhXbi6NzdA16LtWLpSxLE/lIIRhyA==
+
 geojson-equality@0.1.6:
   version "0.1.6"
   resolved "https://registry.npmmirror.com/geojson-equality/-/geojson-equality-0.1.6.tgz#a171374ef043e5d4797995840bae4648e0752d72"
@@ -3717,10 +3727,10 @@ highlight.js@^10.7.2:
   resolved "https://registry.npmmirror.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-highlight.js@^11.3.1:
-  version "11.11.1"
-  resolved "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.11.1.tgz#fca06fa0e5aeecf6c4d437239135fabc15213585"
-  integrity sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==
+highlight.js@^9.12.0:
+  version "9.18.5"
+  resolved "https://registry.npmmirror.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
+  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
 
 iconv-lite@0.6:
   version "0.6.3"
@@ -4124,6 +4134,13 @@ katex@^0.16.9:
   dependencies:
     commander "^8.3.0"
 
+katex@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.npmmirror.com/katex/-/katex-0.6.0.tgz#12418e09121c05c92041b6b3b9fb6bab213cb6f3"
+  integrity sha512-rS4mY3SvHYg5LtQV6RBcK0if7ur6plyEukAOV+jGGPqFImuzu8fHL6M752iBmRGoUyF0bhZbAPoezehn7xYksA==
+  dependencies:
+    match-at "^0.1.0"
+
 khroma@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmmirror.com/khroma/-/khroma-2.1.0.tgz#45f2ce94ce231a437cf5b63c2e886e6eb42bbbb1"
@@ -4197,6 +4214,13 @@ linkify-it@^5.0.0:
   dependencies:
     uc.micro "^2.0.0"
 
+linkify-it@~1.2.2:
+  version "1.2.4"
+  resolved "https://registry.npmmirror.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
+  integrity sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg==
+  dependencies:
+    uc.micro "^1.0.1"
+
 loader-utils@^1.2.3:
   version "1.4.2"
   resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz"
@@ -4223,11 +4247,6 @@ lodash-es@^4.17.15, lodash-es@^4.17.21:
   resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
 
-lodash.flow@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.npmmirror.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
-  integrity sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw==
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz"
@@ -4276,7 +4295,7 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-it-abbr@^1.0.4:
+markdown-it-abbr@^1.0.3:
   version "1.0.4"
   resolved "https://registry.npmmirror.com/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz#d66b5364521cbb3dd8aa59dadfba2fb6865c8fd8"
   integrity sha512-ZeA4Z4SaBbYysZap5iZcxKmlPL6bYA8grqhzJIHB1ikn7njnzaP8uwbtuXc4YXD5LicI4/2Xmc0VwmSiFV04gg==
@@ -4286,11 +4305,6 @@ markdown-it-anchor@^5.0.2:
   resolved "https://registry.npmmirror.com/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz#d549acd64856a8ecd1bea58365ef385effbac744"
   integrity sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==
 
-markdown-it-anchor@^8.4.1:
-  version "8.6.7"
-  resolved "https://registry.npmmirror.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
-  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
-
 markdown-it-attrs@^4.0.0:
   version "4.3.1"
   resolved "https://registry.npmmirror.com/markdown-it-attrs/-/markdown-it-attrs-4.3.1.tgz#1e1f9bd2c87276d8f4ed74ad4268df428b7deee6"
@@ -4308,43 +4322,37 @@ markdown-it-container@^3.0.0:
   resolved "https://registry.npmmirror.com/markdown-it-container/-/markdown-it-container-3.0.0.tgz#1d19b06040a020f9a827577bb7dbf67aa5de9a5b"
   integrity sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw==
 
-markdown-it-deflist@^2.1.0:
+markdown-it-deflist@^2.0.1:
   version "2.1.0"
   resolved "https://registry.npmmirror.com/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz#50d7a56b9544cd81252f7623bd785e28a8dcef5c"
   integrity sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg==
 
-markdown-it-emoji@^1.4.0:
+markdown-it-emoji@^1.1.1, markdown-it-emoji@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmmirror.com/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz#9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"
   integrity sha512-QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg==
 
-markdown-it-emoji@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmmirror.com/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz#cd42421c2fda1537d9cc12b9923f5c8aeb9029c8"
-  integrity sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==
+markdown-it-footnote@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/markdown-it-footnote/-/markdown-it-footnote-2.0.0.tgz#14e9c4f68ff12cf354fa365ae378276e8104ca94"
+  integrity sha512-GMWkJXSHh5tiQt77zCLOSZI2Xy3Oqdb82GmT0Q0h2UT6SbUrMCAiHEiMBIt5V7Xfm73rBxS0VOhlLndkn1GPnw==
 
-markdown-it-footnote@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.npmmirror.com/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz#e0e4c0d67390a4c5f0c75f73be605c7c190ca4d8"
-  integrity sha512-YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w==
+markdown-it-ins@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/markdown-it-ins/-/markdown-it-ins-2.0.0.tgz#a5aa6a30f1e2f71e9497567cfdff40f1fde67483"
+  integrity sha512-DhLLxseIg2C7+AULvoyVI+zMeufR0QFvXJ2o0oV013hN5HvBvNh2rbVtTdxZjI959+hgo2AA0aRdtEIUaKPbhg==
 
-markdown-it-highlightjs@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.npmmirror.com/markdown-it-highlightjs/-/markdown-it-highlightjs-3.6.0.tgz#b567408c633d71e5e4cc33e1d0121a44447d2f29"
-  integrity sha512-ex+Lq3cVkprh0GpGwFyc53A/rqY6GGzopPCG1xMsf8Ya3XtGC8Uw9tChN1rWbpyDae7tBBhVHVcMM29h4Btamw==
+markdown-it-katex@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/markdown-it-katex/-/markdown-it-katex-2.0.3.tgz#d7b86a1aea0b9d6496fab4e7919a18fdef589c39"
+  integrity sha512-nUkkMtRWeg7OpdflamflE/Ho/pWl64Lk9wNBKOmaj33XkQdumhXAIYhI0WO03GeiycPCsxbmX536V5NEXpC3Ng==
   dependencies:
-    highlight.js "^11.3.1"
-    lodash.flow "^3.5.0"
+    katex "^0.6.0"
 
-markdown-it-ins@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmmirror.com/markdown-it-ins/-/markdown-it-ins-3.0.1.tgz#c09356b917cf1dbf73add0b275d67ab8c73d4b4d"
-  integrity sha512-32SSfZqSzqyAmmQ4SHvhxbFqSzPDqsZgMHDwxqPzp+v+t8RsmqsBZRG+RfRQskJko9PfKC2/oxyOs4Yg/CfiRw==
-
-markdown-it-mark@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmmirror.com/markdown-it-mark/-/markdown-it-mark-3.0.1.tgz#51257db58787d78aaf46dc13418d99a9f3f0ebd3"
-  integrity sha512-HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A==
+markdown-it-mark@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/markdown-it-mark/-/markdown-it-mark-2.0.0.tgz#46a1aa947105aed8188978e0a016179e404f42c7"
+  integrity sha512-iT8ua0Bda8QrVwHDOUNw1eyCuL7irXeYch5n8zGS4tb7wsDIn7EjQZLjihKaijzBiL0ikfWL2zAvL/ECqTvsNA==
 
 markdown-it-sub@^1.0.0:
   version "1.0.0"
@@ -4361,15 +4369,18 @@ markdown-it-table-of-contents@^0.4.0:
   resolved "https://registry.npmmirror.com/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.4.tgz#3dc7ce8b8fc17e5981c77cc398d1782319f37fbc"
   integrity sha512-TAIHTHPwa9+ltKvKPWulm/beozQU41Ab+FIefRaQV1NRnpzwcV9QOe6wXQS5WLivm5Q/nlo0rl6laGkMDZE7Gw==
 
-markdown-it-task-lists@^2.1.1:
+markdown-it-task-lists@^2.0.1:
   version "2.1.1"
   resolved "https://registry.npmmirror.com/markdown-it-task-lists/-/markdown-it-task-lists-2.1.1.tgz#f68f4d2ac2bad5a2c373ba93081a1a6848417088"
   integrity sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==
 
-markdown-it-toc-done-right@^4.2.0:
+markdown-it-toc-and-anchor@^4.1.2:
   version "4.2.0"
-  resolved "https://registry.npmmirror.com/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.2.0.tgz#3ccdce22d5022ffae7b991d07261b1b1de5459d0"
-  integrity sha512-UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ==
+  resolved "https://registry.npmmirror.com/markdown-it-toc-and-anchor/-/markdown-it-toc-and-anchor-4.2.0.tgz#d1613327cc63c61f82cd66cbac5564f4db12c0e9"
+  integrity sha512-DusSbKtg8CwZ92ztN7bOojDpP4h0+w7BVOPuA3PHDIaabMsERYpwsazLYSP/UlKedoQjOz21mwlai36TQ04EpA==
+  dependencies:
+    clone "^2.1.0"
+    uslug "^1.0.4"
 
 markdown-it@^12.3.2:
   version "12.3.2"
@@ -4394,6 +4405,17 @@ markdown-it@^14.1.0:
     punycode.js "^2.3.1"
     uc.micro "^2.1.0"
 
+markdown-it@^6.0.1:
+  version "6.1.1"
+  resolved "https://registry.npmmirror.com/markdown-it/-/markdown-it-6.1.1.tgz#ced037f4473ee9f5153ac414f77dc83c91ba927c"
+  integrity sha512-woFl7h/sqt9xRmiMweNuO7nu+w8Lz3SXsDlvE3TYeu1SdPqQ+VW4GZyaKP442Bq6XUN6V6IQjJTR93RDYG2mjw==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "~1.2.2"
+    mdurl "~1.0.1"
+    uc.micro "^1.0.1"
+
 markdown-it@^8.4.1:
   version "8.4.2"
   resolved "https://registry.npmmirror.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
@@ -4405,6 +4427,11 @@ markdown-it@^8.4.1:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
+match-at@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/match-at/-/match-at-0.1.1.tgz#25d040d291777704d5e6556bbb79230ec2de0540"
+  integrity sha512-h4Yd392z9mST+dzc+yjuybOGFNOZjmXIPKWjxBd1Bb23r4SmDOsk2NYCU2BMUBGbSpZqwVsZYNq26QS3xfaT3Q==
+
 math-intrinsics@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
@@ -4455,7 +4482,7 @@ mdn-data@2.0.4:
   resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.4.tgz"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
-mdurl@^1.0.1:
+mdurl@^1.0.1, mdurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
@@ -4496,6 +4523,11 @@ mermaid@^10.6.1:
     uuid "^9.0.0"
     web-worker "^1.2.0"
 
+mgrs@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/mgrs/-/mgrs-1.0.0.tgz#fb91588e78c90025672395cb40b25f7cd6ad1829"
+  integrity sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA==
+
 micromark-core-commonmark@^1.0.1:
   version "1.1.0"
   resolved "https://registry.npmmirror.com/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz#1386628df59946b2d39fb2edfd10f3e8e0a75bb8"
@@ -5130,7 +5162,7 @@ prettier-linter-helpers@^1.0.0:
 
 prettier@^2.8.8:
   version "2.8.8"
-  resolved "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz"
+  resolved "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 prismjs@^1.13.0, prismjs@^1.23.0:
@@ -5143,6 +5175,22 @@ process-nextick-args@~1.0.6:
   resolved "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
   integrity sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==
 
+proj4@^2.3.14, proj4@^2.7.2:
+  version "2.16.2"
+  resolved "https://registry.npmmirror.com/proj4/-/proj4-2.16.2.tgz#6dbf0ebf51f59b7ec21059adc7c98cd4d4fc096b"
+  integrity sha512-1IcYz7wG1kDpPEJSeBy+0v29wW3mhbqUgRReenvhjgHlGjFA9cA72nGWnikUUS/ggq3y/TcShWzR41sikFSrlQ==
+  dependencies:
+    geographiclib-geodesic "^2.1.1"
+    mgrs "1.0.0"
+    wkt-parser "^1.5.1"
+
+proj4leaflet@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/proj4leaflet/-/proj4leaflet-1.0.2.tgz#dec59f1e8a77a1682e320673e1e56f4161714d2a"
+  integrity sha512-6GdDeUlhX/tHUiMEj80xQhlPjwrXcdfD0D5OBymY8WvxfbmZcdhNqQk7n7nFf53ue6QdP9ls9ZPjsAxnbZDTsw==
+  dependencies:
+    proj4 "^2.3.14"
+
 proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
@@ -5924,6 +5972,11 @@ universalify@^0.1.0:
   resolved "https://registry.npmmirror.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+"unorm@>= 1.0.0":
+  version "1.6.0"
+  resolved "https://registry.npmmirror.com/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af"
+  integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==
+
 unplugin-auto-import@^0.16.6:
   version "0.16.6"
   resolved "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.16.6.tgz"
@@ -5999,6 +6052,13 @@ use@^3.1.0:
   resolved "https://registry.npmmirror.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
+uslug@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/uslug/-/uslug-1.0.4.tgz#b9a22f0914e0a86140633dacc302e5f4fa450677"
+  integrity sha512-Jrbpp/NS3TvIGNjfJT1sn3/BCeykoxR8GbNYW5lF6fUscLkbXFwj1b7m4DvIkHm8k3Qr6Co68lbTmoZTMGk/ow==
+  dependencies:
+    unorm ">= 1.0.0"
+
 util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -6080,6 +6140,25 @@ vue-eslint-parser@^9.3.0:
     lodash "^4.17.21"
     semver "^7.3.6"
 
+vue-markdown@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.npmmirror.com/vue-markdown/-/vue-markdown-2.2.4.tgz#db0f774178f3bc91ee18c626d86a3a0d2de22746"
+  integrity sha512-hoTX/W1UIdHZrp/b0vpHSsJXAEfWsafaQLgtE2VX4gY8O/C3L2Gabqu95gyG429rL4ML1SwGv+xsPABX7yfFIQ==
+  dependencies:
+    highlight.js "^9.12.0"
+    markdown-it "^6.0.1"
+    markdown-it-abbr "^1.0.3"
+    markdown-it-deflist "^2.0.1"
+    markdown-it-emoji "^1.1.1"
+    markdown-it-footnote "^2.0.0"
+    markdown-it-ins "^2.0.0"
+    markdown-it-katex "^2.0.3"
+    markdown-it-mark "^2.0.0"
+    markdown-it-sub "^1.0.0"
+    markdown-it-sup "^1.0.0"
+    markdown-it-task-lists "^2.0.1"
+    markdown-it-toc-and-anchor "^4.1.2"
+
 vue-perfect-scrollbar@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmmirror.com/vue-perfect-scrollbar/-/vue-perfect-scrollbar-0.2.1.tgz"
@@ -6107,25 +6186,6 @@ vue-types@^3.0.0:
   dependencies:
     is-plain-object "3.0.1"
 
-vue3-markdown-it@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.npmmirror.com/vue3-markdown-it/-/vue3-markdown-it-1.0.10.tgz#c4b0e94990b3f9d66123ef5b775cd7ea177c609b"
-  integrity sha512-mTvHu0zl7jrh7ojgaZ+tTpCLiS4CVg4bTgTu4KGhw/cRRY5YgIG8QgFAPu6kCzSW6Znc9a52Beb6hFvF4hSMkQ==
-  dependencies:
-    markdown-it "^12.3.2"
-    markdown-it-abbr "^1.0.4"
-    markdown-it-anchor "^8.4.1"
-    markdown-it-deflist "^2.1.0"
-    markdown-it-emoji "^2.0.0"
-    markdown-it-footnote "^3.0.3"
-    markdown-it-highlightjs "^3.6.0"
-    markdown-it-ins "^3.0.1"
-    markdown-it-mark "^3.0.1"
-    markdown-it-sub "^1.0.0"
-    markdown-it-sup "^1.0.0"
-    markdown-it-task-lists "^2.1.1"
-    markdown-it-toc-done-right "^4.2.0"
-
 vue3-perfect-scrollbar@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/vue3-perfect-scrollbar/-/vue3-perfect-scrollbar-2.0.0.tgz#51cedf1090d731ec7cc8163067e348867de0aa69"
@@ -6212,6 +6272,11 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+wkt-parser@^1.5.1:
+  version "1.5.2"
+  resolved "https://registry.npmmirror.com/wkt-parser/-/wkt-parser-1.5.2.tgz#a8eaf86ac2cc1d0a2e6a8082a930f5c7ebdb5771"
+  integrity sha512-1ZUiV1FTwSiSrgWzV9KXJuOF2BVW91KY/mau04BhnmgOdroRQea7Q0s5TVqwGLm0D2tZwObd/tBYXW49sSxp3Q==
+
 word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz"

web_ui/package-lock.json

@@ -8225,6 +8225,11 @@
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true
     },
+    "mgrs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/mgrs/-/mgrs-1.0.0.tgz",
+      "integrity": "sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA=="
+    },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.10.tgz",
@@ -11848,6 +11853,23 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
+    "proj4": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmmirror.com/proj4/-/proj4-2.15.0.tgz",
+      "integrity": "sha512-LqCNEcPdI03BrCHxPLj29vsd5afsm+0sV1H/O3nTDKrv8/LA01ea1z4QADDMjUqxSXWnrmmQDjqFm1J/uZ5RLw==",
+      "requires": {
+        "mgrs": "1.0.0",
+        "wkt-parser": "^1.4.0"
+      }
+    },
+    "proj4leaflet": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/proj4leaflet/-/proj4leaflet-1.0.2.tgz",
+      "integrity": "sha512-6GdDeUlhX/tHUiMEj80xQhlPjwrXcdfD0D5OBymY8WvxfbmZcdhNqQk7n7nFf53ue6QdP9ls9ZPjsAxnbZDTsw==",
+      "requires": {
+        "proj4": "^2.3.14"
+      }
+    },
     "promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/promise-inflight/-/promise-inflight-1.0.1.tgz",
@@ -15586,6 +15608,11 @@
       "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
       "dev": true
     },
+    "wkt-parser": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/wkt-parser/-/wkt-parser-1.4.0.tgz",
+      "integrity": "sha512-qpwO7Ihds/YYDTi1aADFTI1Sm9YC/tTe3SHD24EeIlZxy7Ik6a1b4HOz7jAi0xdUAw487duqpo8OGu+Tf4nwlQ=="
+    },
     "wordwrap": {
       "version": "0.0.2",
       "resolved": "https://registry.npmmirror.com/wordwrap/-/wordwrap-0.0.2.tgz",

web_ui/src/views/industrial-land/AiIndustriaLandDetail.vue

@@ -517,50 +517,7 @@ export default {
     this.$nextTick(() => {
       this.activeIndex = 0;
       this.initMap();
-
-      // this.showResult = true;
-      // this.showQuery = true;
-      // this.xgdk = [
-      //   {
-      //     id: 1839,
-      //   },
-      //   {
-      //     id: 1843,
-      //   },
-      //   {
-      //     id: 1845,
-      //   },
-      // ];
-      // // this.xgdk = [
-      // //   {
-      // //     id: 7685,
-      // //   },
-      // //   {
-      // //     id: 37091,
-      // //   },
-      // //   {
-      // //     id: 40175,
-      // //   },
-      // // ];
-      // let that = this;
-      // this.getDetailByIdList(this.xgdk, (data) => {
-      //   this.xgdk = data;
-      //   this.addGdLayer(this.xgdk);
-      // });
-
-      // this.detailData = {
-      //   id: 48668,
-      //   dkid: "1895353609416212480",
-      //   xzqmc: "萧山区",
-      //   dkmc: "湘湖国家旅游度假区建设工矿仓储项目",
-      //   address: "位于萧山区义桥镇，东至空地，南至空地，西至空地，北至云临路。",
-      //   dkmj: 60.714,
-      //   tdyt: "工业用地",
-      //   tax: "100",
-      //   center_wkt: "POINT(120.912063 29.486802)",
-      // };
-      // this.showDetail = true;
-      // this.checkPermision();
+      // this.mockTestData();
     });
   },
   created() {
@@ -2014,6 +1971,37 @@ export default {
         },
       ]);
     },
+    mockTestData() {
+      this.showResult = true;
+      this.showQuery = true;
+      this.xgdk = [
+        {
+          id: 1839,
+        },
+        {
+          id: 1843,
+        },
+        {
+          id: 1845,
+        },
+      ];
+      // 备选测试数据
+      // this.xgdk = [
+      //   {
+      //     id: 7685,
+      //   },
+      //   {
+      //     id: 37091,
+      //   },
+      //   {
+      //     id: 40175,
+      //   },
+      // ];
+      this.getDetailByIdList(this.xgdk, (data) => {
+        this.xgdk = data;
+        this.addGdLayer(this.xgdk);
+      });
+    },
   },
 };
 </script>

web_ui/src/views/industrial-land/ZnxzDetail.vue

@@ -12,11 +12,11 @@
     <div class="content" v-else>
       <div class="tabs">
         <div class="item" v-for="(item, index) in tabs" :key="index" :class="[
-          {
-            checked: selectIndex == index,
-            bl: index == 0,
-            br: index == tabs.length - 1,
-          },
+            {
+              checked: selectIndex == index,
+              bl: index == 0,
+              br: index == tabs.length - 1,
+            },
         ]" @click="toggleTab(index)">
           {{ item }}
         </div>
@@ -252,8 +252,8 @@
             </div>
           </div>
           <div class="table-panel" v-if="
-            Array.isArray(zbhjTabs[zbhjIndex].result) &&
-            zbhjTabs[zbhjIndex].result.length > 0
+              Array.isArray(zbhjTabs[zbhjIndex].result) &&
+              zbhjTabs[zbhjIndex].result.length > 0
           ">
             <div class="th">
               <div class="it xh">序号</div>
@@ -285,13 +285,11 @@
               <div class="checked" v-if="ggssIndex == index"></div>
             </div>
           </div>
-          <!-- <div class="scrollSlider" ref="scrollBox">
-            <div class="contentSlider" ref="scrollBar"></div>
-          </div> -->
+         
           <vue-perfect-scrollbar class="zb-panel" :settings="settings">
             <template v-if="
-              Array.isArray(ggssTabs[ggssIndex].result) &&
-              ggssTabs[ggssIndex].result.length > 0
+                Array.isArray(ggssTabs[ggssIndex].result) &&
+                ggssTabs[ggssIndex].result.length > 0
             ">
               <div class="c-item" v-for="(item, index) in ggssTabs[ggssIndex].result" @click="goLocationByCenter(item)"
                 :key="index">
@@ -443,20 +441,16 @@ export default {
             },
           ],
           trafficConditions: [
-            {
-              name: "公交站",
-              result: [],
-            },
             {
               name: "高速",
               result: [],
             },
             {
-              name: "省道",
+              name: "铁路",
               result: [],
             },
             {
-              name: "国道",
+              name: "机场",
               result: [],
             },
             {
@@ -464,15 +458,7 @@ export default {
               result: [],
             },
             {
-              name: "乡道",
-              result: [],
-            },
-            {
-              name: "铁路",
-              result: [],
-            },
-            {
-              name: "县道",
+              name: "公交站",
               result: [],
             },
             {
@@ -480,9 +466,9 @@ export default {
               result: [],
             },
             {
-              name: "机场",
+              name: "公路",
               result: [],
-            },
+            }
           ],
           surroundingEnv: [
             {
@@ -1059,6 +1045,10 @@ export default {
   watch: {
     item: {
       handler(newVal, oldVal) {
+        // Skip init if only show property changed
+        if (JSON.stringify({...newVal, show: oldVal && oldVal.show}) === JSON.stringify({...oldVal, show: oldVal && oldVal.show})) {
+          return;
+        }
         this.init();
       },
       deep: true,
@@ -1073,6 +1063,7 @@ export default {
       this.sqsxIndex = -1;
       setTimeout(() => {
         this.analysis();
+        this.toggleTab(0);
       }, 500);
     },
     zbcyClick(item, index) {
@@ -1089,7 +1080,7 @@ export default {
     goInfoLocation(wkt) {
       this.$emit("gowkt", wkt);
     },
-
+    
     getReduceList(arr) {
       let obj = {};
       arr = arr.reduce((cur, next) => {
@@ -1151,12 +1142,9 @@ export default {
       this.$emit("toggle");
       if (index == 2) {
         this.toggltGgssIndex(0, { name: "医院" });
-      } else if (index == 4) {
-        this.toggltZbIndex(0, { name: "地铁站" });
       } else if (index == 3) {
-        this.toggltZbhjIndex(0, { name: "化工厂" });
-      }
-      if (index == 1) {
+        this.toggltZbIndex(0, { name: "高速" });
+      } else if (index == 1) {
         this.$nextTick(() => {
           this.initYearCharts();
           this.initSexCharts();
@@ -1688,10 +1676,6 @@ export default {
             this.sexData[0].value = 0;
             this.sexData[1].value = 0;
           }
-          this.$nextTick(() => {
-            this.initYearCharts();
-            this.initSexCharts();
-          });
         })
         .catch(error => {
           console.error('Error in population search:', error);
@@ -1704,10 +1688,6 @@ export default {
           this.yearData[1].value = 0;
           this.sexData[0].value = 0;
           this.sexData[1].value = 0;
-          this.$nextTick(() => {
-            this.initYearCharts();
-            this.initSexCharts();
-          });
         });
     },
     async queryVillageName(wktStr) {
@@ -1993,33 +1973,33 @@ export default {
         var str = "省道国道乡道县道";
         var roadData = [];
         data.trafficConditions.forEach((item) => {
-          if (str.indexOf(item.name) > -1) {
-            if (item.result) {
-              var label = "G";
-              if (item.name == "省道") {
-                label = "S";
-              }
-              if (item.name == "国道") {
-                label = "G";
-              }
-              if (item.name == "县道") {
-                label = "X";
-              }
-              if (item.name == "乡道") {
-                label = "S";
-              }
-              item.result.forEach((t) => {
-                t.label = label;
-                roadData.push(t);
-              });
-            }
-          } else {
+          // if (str.indexOf(item.name) > -1) {
+          //   if (item.result) {
+          //     var label = "G";
+          //     if (item.name == "省道") {
+          //       label = "S";
+          //     }
+          //     if (item.name == "国道") {
+          //       label = "G";
+          //     }
+          //     if (item.name == "县道") {
+          //       label = "X";
+          //     }
+          //     if (item.name == "乡道") {
+          //       label = "S";
+          //     }
+          //     item.result.forEach((t) => {
+          //       t.label = label;
+          //       roadData.push(t);
+          //     });
+          //   }
+          // } else {
             that.zbTabs.push(item);
-          }
+          // }
         });
-        if (roadData) {
-          that.zbTabs.push({ name: "公路", result: roadData });
-        }
+        // if (roadData) {
+        //   that.zbTabs.push({ name: "公路", result: roadData });
+        // }
         that.yyList = that.zbTabs[0].result;
       }
       that.ggssTabs = [];

web_ui/static/config.js

@@ -1,8 +1,13 @@
 (function (window) {
   window.ApplicationConfig = {
     serverURL: "/server",
+<<<<<<< HEAD
     // subscribeUrl: 'http://localhost:8511/subscribe/',
     subscribeUrl: '/agentai',
+=======
+    subscribeUrl: 'http://localhost:8511/subscribe/',
+    landAnalysisUrl: 'http://localhost:8001/land_analysis/stream',
+>>>>>>> 6094115ba1534c7a7dd73a0bc50ba5e5a7115312
     queryGeometryUrl: 'http://localhost:8511/queryGeometry',
     kgQueryUrl: 'http://localhost:8511/kgQuery',
     klyzyQueryUrl: 'http://localhost:8511/klyzyQuery',
@@ -13,16 +18,12 @@
     //  subscribeUrl: 'http://10.10.9.143:8511/subscribe/',
     //  subscribeUrl: 'http://localhost:8511/subscribe/',
     // subscribeUrl: 'http://192.168.0.145:8511/subscribe/',
-    // zcbdUrl: 'http://ai.zjugis.com:8510/policy/#/home',
-    // fgbdUrl: 'http://ai.zjugis.com:8510/policy/#/regulation',
     zcbdUrl: "http://121.40.148.47:8529/#/zcbd/ai-search",
     fgbdUrl: 'http://121.40.148.47:8529/#/zcbd/ai-search',
     wadsUrl: 'http://ai.zjugis.com:8523/home',
     landuseAiUrl: 'http://ai.zjugis.com:8510/#/assistant',
     aiUrl: 'http://ai.zjugis.com:8510/#/ai',
     zizsUrl: 'http://ai.zjugis.com:8510/#/ai-assistant',
-    // aiUrl: 'http://localhost:8080/#/ai',
-    // landuseAiUrl:'http://localhost:8080/#/assistant',
     gdUrl: 'http://60.191.110.204:6080/arcgis/rest/services/sde/ZPGGD/MapServer',
     landUrl: 'http://60.191.110.204:6080/arcgis/rest/services/sde/ecgap_klyzy/MapServer',
     xzqUrl: 'http://60.191.110.204:6080/arcgis/rest/services/sde/ZJXZQ/MapServer',

web_ui/yarn.lock

@@ -5121,11 +5121,6 @@ he@1.2.x, he@^1.2.0:
   resolved "https://registry.npmmirror.com/he/-/he-1.2.0.tgz"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-heatmap.js@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.npmmirror.com/heatmap.js/-/heatmap.js-2.0.5.tgz"
-  integrity sha512-CG2gYFP5Cv9IQCXEg3ZRxnJDyAilhWnQlAuHYGuWVzv6mFtQelS1bR9iN80IyDmFECbFPbg6I0LR5uAFHgCthw==
-
 hex-color-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmmirror.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"
@@ -6539,6 +6534,11 @@ methods@~1.1.2:
   resolved "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
+mgrs@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/mgrs/-/mgrs-1.0.0.tgz#fb91588e78c90025672395cb40b25f7cd6ad1829"
+  integrity sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA==
+
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.10.tgz"
@@ -8101,6 +8101,21 @@ process@^0.11.10:
   resolved "https://registry.npmmirror.com/process/-/process-0.11.10.tgz"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
+proj4@^2.3.14:
+  version "2.15.0"
+  resolved "https://registry.npmmirror.com/proj4/-/proj4-2.15.0.tgz#d77c9956861c8ed516071c4208d576cebe800eb5"
+  integrity sha512-LqCNEcPdI03BrCHxPLj29vsd5afsm+0sV1H/O3nTDKrv8/LA01ea1z4QADDMjUqxSXWnrmmQDjqFm1J/uZ5RLw==
+  dependencies:
+    mgrs "1.0.0"
+    wkt-parser "^1.4.0"
+
+proj4leaflet@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/proj4leaflet/-/proj4leaflet-1.0.2.tgz#dec59f1e8a77a1682e320673e1e56f4161714d2a"
+  integrity sha512-6GdDeUlhX/tHUiMEj80xQhlPjwrXcdfD0D5OBymY8WvxfbmZcdhNqQk7n7nFf53ue6QdP9ls9ZPjsAxnbZDTsw==
+  dependencies:
+    proj4 "^2.3.14"
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/promise-inflight/-/promise-inflight-1.0.1.tgz"
@@ -10316,6 +10331,11 @@ window-size@0.1.0:
   resolved "https://registry.npmmirror.com/window-size/-/window-size-0.1.0.tgz"
   integrity sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==
 
+wkt-parser@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/wkt-parser/-/wkt-parser-1.4.0.tgz#7cca07a6ee5b4baf059b723e62d7fe95bc923bf5"
+  integrity sha512-qpwO7Ihds/YYDTi1aADFTI1Sm9YC/tTe3SHD24EeIlZxy7Ik6a1b4HOz7jAi0xdUAw487duqpo8OGu+Tf4nwlQ==
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.npmmirror.com/wordwrap/-/wordwrap-0.0.2.tgz"