From 086bd5fd16565e17eddecbce50cc356246a12e37 Mon Sep 17 00:00:00 2001
From: unknown <2569982966@qq.com>
Date: Thu, 16 Nov 2023 13:16:19 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E5=BA=93overview=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                          | 458 ++-----------------
 src/App.js                                   |  15 +-
 src/military/achievement.js                  |  17 +-
 src/military/achievement/overview/index.jsx  | 227 +++++++++
 src/military/achievement/overview/index.scss | 215 +++++++++
 5 files changed, 495 insertions(+), 437 deletions(-)
 create mode 100644 src/military/achievement/overview/index.jsx
 create mode 100644 src/military/achievement/overview/index.scss

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b6bb1a5df..0b803d869 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,293 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/build/LICENSE" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/asset-manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/build/asset-manifest.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/service-worker.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/service-worker.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/0.b4e2ef10.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/1.68949f00.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/10.1be71b42.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/100.41f2a409.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/101.8c9ebcb9.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/102.ae5e7930.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/103.71e1260c.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/104.6010b0d8.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/105.d97473e3.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/106.a18d9295.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/107.e4fa8da8.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/108.cb5fa18c.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/109.728021f4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/11.1e6e3f2f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/110.4d60f060.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/111.00847641.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/112.dff32e36.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/113.9321d650.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/114.ab44c57c.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/115.16bc2b0d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/116.acb34db4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/117.c12032ae.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/118.06ac0c97.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/119.09fe7ab0.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/12.c388554b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/120.712692c0.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/121.5542a234.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/122.5434414a.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/123.56b5aa50.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/124.4fa3c025.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/125.e90a0e54.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/126.6ac902e8.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/127.382109ca.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/128.f5cab6ce.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/129.a97defb5.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/13.5f9dd754.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/130.dc6cfef3.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/131.e36c51f6.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/132.e86e6598.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/133.cd5b0e41.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/134.a45157f4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/135.219cca2d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/136.792455ab.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/137.d98f1f26.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/138.537d528f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/139.f968f8da.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/14.ae36f994.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/140.d2937c5d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/141.41414563.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/142.085bcaac.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/143.7c7bdefd.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/144.2734eeac.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/145.0567a7a7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/146.6f118df0.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/147.8ad6802f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/148.1509b466.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/149.5a32ad42.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/15.63726bf5.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/150.67b85412.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/151.80c1ff31.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/152.a8ce322f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/153.eb7d58a7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/154.4378c4dc.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/155.fd685811.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/156.2b59a7a3.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/157.2d1b2b40.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/158.809809fb.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/159.6b94727b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/16.cd292edc.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/160.5c01b4fe.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/161.2e3c0cf9.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/162.87f4e888.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/163.0a540ffa.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/164.b22433aa.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/165.2670f91b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/166.ba688344.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/167.c636b766.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/168.96ee0643.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/169.59c6e595.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/17.9b37107f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/170.a0e40916.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/171.c5e14617.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/172.aa2c6247.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/173.f234f2ec.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/174.23eb263b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/175.978237cd.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/176.6a70c7ca.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/177.babfb8a0.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/178.ca78bfb7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/179.d209043e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/18.59166b96.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/180.34e55d7e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/181.dd0e9427.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/182.c133a270.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/183.f43e4007.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/184.3abba332.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/185.c61d56af.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/186.5ca9f085.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/187.99889df3.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/188.9a0c959d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/189.98f6f431.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/19.e9122038.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/190.a972b289.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/191.91c8d4dd.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/192.09b656bb.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/193.2db797e4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/194.570ec7dc.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/195.8bafb8cc.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/196.ebf790e4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/197.e98bbe5e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/198.59eec2cd.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/199.f7a6cf5d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/2.2225a575.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/20.ea1b83ca.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/200.64c98b62.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/201.4dcc10b4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/202.4e8c6091.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/203.d93d18f4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/204.0919cf31.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/205.1d636166.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/206.5c119f09.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/207.147ba6db.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/208.25081b68.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/209.784c19f9.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/21.66ea1441.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/210.ebc5386b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/211.ca304f55.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/212.b5fc6346.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/213.9e5a8f54.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/214.471a7c4b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/215.cf8d392b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/216.8ce08d4e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/217.03e5cde4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/218.c3b4a63d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/219.df96a008.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/22.69d33500.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/220.83a4b3b7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/221.0e7c7b15.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/222.ae23590f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/223.6e1a4ddc.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/224.66c696e0.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/225.86f6de74.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/226.334eacdf.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/227.fded1c54.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/228.081121a3.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/229.fbecdb8f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/23.f3d3a190.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/230.54214923.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/231.78c978ac.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/232.65715f0f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/233.892f3048.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/234.9aa182e7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/235.d81ddb83.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/236.69cf4cf6.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/237.71ab4f1f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/238.8572225b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/239.fcae5847.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/24.2f9ea72c.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/240.e2238e45.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/241.83f72690.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/242.d3cb57dd.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/243.99af0ef6.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/244.38603408.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/245.2d35733a.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/246.e8bec9f4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/247.c9b742e0.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/248.9f3a7f5e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/249.a235bfb8.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/25.3253bb14.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/250.89a0ec2e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/251.f94f4795.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/252.614475d7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/253.16b76954.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/254.64d033a9.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/255.d2823d40.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/256.1eca44ce.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/257.7dd534ae.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/258.03522780.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/259.073dfc4a.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/26.9902b511.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/260.35044602.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/261.617c2c29.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/262.031490eb.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/263.0713aea5.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/264.72a7fa9b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/265.8136f3c3.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/266.5c84b920.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/267.56ebb248.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/268.21a4574f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/269.28226efe.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/27.4304d4c5.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/270.c5d4fa4b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/271.78c89e20.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/272.c46f7455.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/273.aa76ad67.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/274.42a38d5c.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/275.eab35d6d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/276.ba152567.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/277.8ad1fd18.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/278.82ce41b4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/279.92f86639.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/28.3836fc1f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/280.d787fd18.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/281.8bdfd9de.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/282.2f9ff948.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/283.40367bdd.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/29.b7147766.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/3.31787e19.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/30.a574d03f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/31.df24e028.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/32.c4d7bbea.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/33.a4469f83.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/34.a525a713.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/35.991c6b3a.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/36.ca30f366.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/37.b67239f9.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/38.d6220035.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/39.8bbe7e4b.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/4.3c8412d9.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/42.b16613be.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/46.41f6ac73.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/47.b0fb496a.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/48.0f00b572.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/49.8b9d29ee.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/5.2b2c8a26.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/50.b42a5752.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/51.37761187.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/52.550fc073.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/53.86605c6d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/54.e91a419f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/55.c6646d9f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/56.b701b846.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/57.7796d2c0.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/58.865fc1eb.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/59.b58d70cd.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/6.625bd454.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/60.f785cede.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/61.f63d91e7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/62.b83b97dc.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/63.5d9d4d43.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/64.d1514b70.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/65.67458d6c.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/66.ab5a4b68.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/67.24cbd43e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/68.26be36d2.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/69.d34e03a8.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/7.45c119ae.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/70.71f3f5e9.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/71.3e0e22a5.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/72.58d589d7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/73.38beeb0e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/74.f0ac65fe.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/75.9f0bfe3e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/76.7bf08411.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/77.cc859ed7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/78.1e7b969f.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/79.d68cadb4.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/8.ce3f8347.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/80.3633279d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/81.13af2c38.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/82.dfb68271.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/83.a2cc3c51.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/84.284aff4a.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/85.41f3159a.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/86.4e688009.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/87.90d54fab.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/88.03076a1d.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/89.0d2f2ee8.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/9.562a7877.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/90.3b84e0a5.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/91.ad92675e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/92.6abb40b8.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/93.e5666aea.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/94.149f3765.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/95.36a069b7.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/96.c09dc12e.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/97.8ff3af84.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/98.cd3f899c.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/99.07307f5a.chunk.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/static/js/main.dda56577.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/App.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/military/achievement.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/military/achievement.js" afterDir="false" />
     </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -308,112 +25,6 @@
     <expand />
     <select />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/App.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="12376">
-              <caret line="760" column="37" selection-start-line="760" selection-start-column="37" selection-end-line="760" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1989">
-              <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
-              <folding>
-                <element signature="e#0#26#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1564">
-              <caret line="98" column="20" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4097">
-              <caret line="248" column="18" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2431">
-              <caret line="155" column="14" selection-start-line="155" selection-start-column="14" selection-end-line="157" selection-end-column="21" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="765">
-              <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="14127">
-              <caret line="820" lean-forward="true" selection-start-line="820" selection-end-line="820" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4726">
-              <caret line="286" column="34" selection-start-line="286" selection-start-column="34" selection-end-line="286" selection-end-column="34" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>high</find>
@@ -520,10 +131,14 @@
       </list>
     </option>
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectFrameBounds" fullScreen="true">
     <option name="width" value="1440" />
     <option name="height" value="900" />
   </component>
+  <component name="ProjectId" id="2YClPBaBLaS9sGQKExglr7skyiR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -549,18 +164,24 @@
       <pane id="Scope" />
     </panes>
   </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "WebServerToolWindowFactoryState": "false",
+    "last_opened_file_path": "E:/forgeplus-react/src/military/achievement/overview",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\forgeplus-react\src\military\achievement\overview" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/src/modules/user/usersInfo" />
@@ -575,18 +196,7 @@
       </list>
     </option>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
   <component name="SvnConfiguration">
     <configuration />
@@ -635,6 +245,7 @@
       <workItem from="1587870344748" duration="138000" />
       <workItem from="1587882941476" duration="4365000" />
       <workItem from="1587891008299" duration="390000" />
+      <workItem from="1700037429191" duration="1219000" />
     </task>
     <servers />
   </component>
@@ -667,7 +278,7 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.History.Properties">
     <option name="COLUMN_ORDER">
@@ -684,22 +295,7 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State>
-              <option name="RECENTLY_FILTERED_USER_GROUPS">
-                <collection />
-              </option>
-              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-                <collection />
-              </option>
-              <option name="COLUMN_ORDER">
-                <list>
-                  <option value="0" />
-                  <option value="1" />
-                  <option value="2" />
-                  <option value="3" />
-                </list>
-              </option>
-            </State>
+            <State />
           </value>
         </entry>
       </map>
diff --git a/src/App.js b/src/App.js
index b86b837ff..d76861a22 100644
--- a/src/App.js
+++ b/src/App.js
@@ -372,7 +372,7 @@ class App extends Component {
                   }
                 }>
               </Route>
-              
+
               {/*403*/}
               <Route path="/403" component={Shixunauthority} />
 
@@ -392,15 +392,20 @@ class App extends Component {
                   }
                 }>
               </Route>
+
+
               {/*成果*/}
               <Route
-                path={"/achievement"}
+                path={"/achievementOverview"}
                 render={
                   (props) => {
                     return (<Achievement {...this.props} {...props} {...this.state} />)
                   }
                 }>
               </Route>
+
+
+
               {/*任务*/}
               <Route path="/task" component={Task} />
               {/*专家评审*/}
@@ -409,7 +414,7 @@ class App extends Component {
               <Route path="/competition/myFocus" component={MyFocusCompetitions} />
               {/*启智2022*/}
 							<Route path="/competition/:competitionId" component={Competition} />
-                
+
               <Route exact path="/explore/all"
                 render={
                   (props) => (
@@ -430,7 +435,7 @@ class App extends Component {
                   path="/login"
                   render={(props) =><LoginRegisterPage {...this.props} {...props}/>}
               ></Route>
-							
+
               {/* 注册 */}
               <Route
                   path="/register"
@@ -472,7 +477,7 @@ class App extends Component {
                   }
                 }>
               </Route>
-              
+
               {/*新建项目等*/}
               <Route
                 path={"/projects"}
diff --git a/src/military/achievement.js b/src/military/achievement.js
index 7d6a96900..55ceb29d2 100644
--- a/src/military/achievement.js
+++ b/src/military/achievement.js
@@ -11,6 +11,13 @@ import Loading from "../Loading";
 import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
 import './index.scss';
 
+
+const Overview = Loadable({
+    loader: () => import("./achievement/overview"),
+    loading: Loading,
+});
+
+
 const NoticeList = Loadable({
   loader: () => import("./achievement/noticeList"),
   loading: Loading,
@@ -34,13 +41,21 @@ class Index extends Component {
               <NoticeDetail {...this.props} {...props} />
             )}
           ></Route>
-          
+
           <Route
             path="/achievement"
             render={(props) => (
               <NoticeList {...this.props} {...props} />
             )}
           ></Route>
+
+
+            <Route
+                path="/achievementOverview"
+                render={(props) => (
+                    <Overview {...this.props} {...props} />
+                )}
+            ></Route>
         </Switch>
       </div>
     );
diff --git a/src/military/achievement/overview/index.jsx b/src/military/achievement/overview/index.jsx
new file mode 100644
index 000000000..e094ad4cc
--- /dev/null
+++ b/src/military/achievement/overview/index.jsx
@@ -0,0 +1,227 @@
+import React, { useEffect, useState } from 'react';
+import classNames from 'classnames';
+import { Pagination, Icon, Input, Affix, } from 'antd';
+import ItemList from '../components/itemList';
+import { achieveSource } from '../static';
+import Nodata from '../../../forge/Nodata';
+import Loading from "../../../Loading";
+import noticePng from '../image/banner.png';
+import { getNoticeList } from '../api';
+
+import './index.scss';
+const Search = Input.Search;
+
+export default (props) => {
+
+  const [tab, setTab] = useState('0');
+  const [loading, setLoading] = useState(false);
+
+  const [title, setTitle] = useState(undefined);
+  const [orderBy, setOrderBy] = useState('publishDateDesc');
+
+  const [curPage, setCurPage] = useState(1);
+  const [total, setTotal] = useState(0);
+  const [noticeList, setNoticeList] = useState([]);
+
+  const [callList, setCallList] = useState([]);
+  const [changeList, setChangeList] = useState([]);
+  const [checkList, setCheckList] = useState([]);
+  const [abandonList, setAbandonList] = useState([]);
+  const [competitionList, setCompetitionList] = useState([]);
+  const [dealList, setDealList] = useState([]);
+
+  useEffect(() => {
+    setLoading(true);
+    if (tab === '0' || tab === '7') {
+      const params = {
+        orderBy,
+        curPage: 1,
+        isChecked: 1,
+        pageSize: 5,
+        status: 1,
+        type: 7,
+        title,
+        flag: 1,   //后台管理查询：2；前台展示：1
+      };
+      getNoticeList({ ...params,achievementSource:'开源项目' }).then(data => {
+        setCallList(data.rows);
+        setLoading(false);
+      });
+      getNoticeList({...params,achievementSource:'创客任务'}).then(data => {
+        setChangeList(data.rows);
+      });
+      getNoticeList({ ...params,achievementSource:'开放竞赛' }).then(data => {
+        setCompetitionList(data.rows);
+      });
+      getNoticeList({ ...params,achievementSource:'科研成果' }).then(data => {
+        setCheckList(data.rows);
+      });
+      getNoticeList({ ...params,achievementSource:'其他' }).then(data => {
+        setAbandonList(data.rows);
+        setLoading(false);
+      });
+    } else {
+      const params = {
+        orderBy,
+        curPage,
+        isChecked: 1,
+        pageSize: 10,
+        status: 1,
+        title,
+        type: 7,
+        achievementSource:tab,
+        flag: 1,   //后台管理查询：2；前台展示：1
+      };
+      getNoticeList(params).then(data => {
+        setNoticeList(data.rows);
+        setTotal(data.total);
+        setLoading(false);
+      })
+    }
+  }, [tab, title, orderBy, curPage]);
+
+  function changeSort(sortType) {
+    setOrderBy(sortType);
+    setCurPage(1);
+  }
+
+  function noticeClick(id) {
+    props.history.push(`/achievement/noticeDetail/${id}`);
+  }
+
+  function sortNav() {
+    return <div className="notice-sort-nav">
+      <Search
+        size="large"
+        maxLength={20}
+        style={{ width: "56%" }}
+        placeholder="输入标题关键字，不能超过20字符"
+        enterButton={<span><Icon type="search" className="mr5" /> 搜索</span>}
+        onSearch={(value) => setTitle(value)} />
+      <div className="center-right-but">
+        <div className={classNames({ sortLink: true, active: orderBy === 'publishDateDesc' })} onClick={() => { changeSort('publishDateDesc') }}>时间降序<Icon type="arrow-down" /></div>
+        <span className="piece">|</span>
+        <div className={classNames({ sortLink: true, active: orderBy === 'publishDateAsc' })} onClick={() => { changeSort('publishDateAsc') }}>时间升序<Icon type="arrow-up" /></div>
+      </div>
+    </div>
+  }
+
+  function handleClick(e) {
+    setTab(e.key);
+    setCurPage(1);
+    setTitle('');
+    setOrderBy('publishDateDesc');
+  }
+
+  function click(e){
+    setTab(e);
+    setCurPage(1);
+    setTitle('');
+    setOrderBy('publishDateDesc');
+  }
+
+  function cont(param, titleStr, key, svgStr) {
+    return <React.Fragment>
+      <div className="item-head-title">
+        <div className="item-head-title-content">
+          <i className={svgStr}></i>
+          <span>{titleStr}</span>
+        </div>
+        {param.length === 5 && <span className="link" onClick={() => { handleClick({ key: key }) }}>查看更多 <Icon type="arrow-right" /></span>}
+      </div>
+      {param.length > 0 ? <ItemList
+        list={param}
+        itemClick={noticeClick}
+      /> : <Nodata _html="暂无数据" />}
+    </React.Fragment>
+  }
+
+  // 成果库具体jsx渲染函数
+  function content() {
+    if (tab === '0') {
+      if(callList.length === 0 && changeList.length === 0 && competitionList.length === 0 && checkList.length === 0 && abandonList.length === 0){
+        return <React.Fragment><Nodata _html="暂无数据" /></React.Fragment>
+      }else{
+        return <React.Fragment>
+          {cont(callList, "开源项目", '开源项目', "iconfont icon-zhaobiaogonggao")}
+          {cont(changeList, "创客任务", '创客任务', "iconfont icon-gengzhenggonggao")}
+          {cont(competitionList, "开放竞赛", '开放竞赛', "iconfont icon-chengjiaogonggao")}
+          {cont(checkList, "科研成果", '科研成果', "iconfont icon-zhongbiaogonggao")}
+          {cont(abandonList, "其他", '其他', "iconfont icon-feibiaogonggao")}
+        </React.Fragment>
+      }
+    } else {
+      let titleStr;
+      let svgStr;
+      switch (tab) {
+        case '开源项目':
+          titleStr = "开源项目";
+          svgStr = "iconfont icon-gengzhenggonggao"
+          break;
+        case '创客任务':
+          titleStr = "创客任务";
+          svgStr = "iconfont icon-zhongbiaogonggao"
+          break;
+        case '开放竞赛':
+          titleStr = "开放竞赛";
+          svgStr = "iconfont icon-chengjiaogonggao"
+          break;
+        case '科研成果':
+          titleStr = "科研成果";
+          svgStr = "iconfont icon-feibiaogonggao"
+          break;
+        case '其他':
+          titleStr = "其他";
+          svgStr = "iconfont icon-zhaobiaogonggao"
+          break;
+      }
+      return <React.Fragment>
+        <div className="item-head-title">
+          <div className="item-head-title-content">
+            <i className={svgStr}></i>
+            <span>{titleStr}</span>
+          </div>
+        </div>
+        <ItemList
+          list={noticeList}
+          itemClick={noticeClick}
+        />
+        {total > 0 ? total> 10 ? <div className="edu-txt-center mt30 mb30">
+          <Pagination
+            showQuickJumper
+            onChange={(page) => { setCurPage(page) }}
+            current={curPage}
+            total={total}
+            showTotal={total => `共 ${total} 条`}
+          />
+        </div> : "" : <Nodata _html="暂无数据" />}
+      </React.Fragment>
+    }
+  }
+
+  return (
+    <React.Fragment>
+      <img alt="图片加载失败" src={noticePng} width="100%"></img>
+      <div className="centerbox notice-list clearfix">
+        <div className="body">
+        <Affix className="affix-list-left" offsetTop={90}>
+          <div className="navigationMenu">
+            <ul className="menu-ul">
+              <li className="MenuTitle" onClick={()=>click('0')}><span><i className="iconfont icon-xiangmugonggao"></i>成果来源</span></li>
+              {
+                achieveSource.map(item=>{
+                  return <li className={tab == item.code ? "active" : ""} onClick={()=>click(item.code)} key={item.code}><span>{item.name}</span></li>
+                })
+              }
+            </ul>
+          </div>
+          </Affix>
+          <div className="notice-center-content">
+            {sortNav()}
+            {loading ? <Loading /> : content()}
+          </div>
+        </div>
+      </div>
+    </React.Fragment>
+  )
+}
\ No newline at end of file
diff --git a/src/military/achievement/overview/index.scss b/src/military/achievement/overview/index.scss
new file mode 100644
index 000000000..2c2eabe92
--- /dev/null
+++ b/src/military/achievement/overview/index.scss
@@ -0,0 +1,215 @@
+.notice-list{
+  .ant-tabs {
+    .ant-tabs-left-bar{
+      border: 1px solid #E5E5E5;
+      .ant-tabs-nav-container{
+        margin-right: 0;
+      }
+      .ant-tabs-nav-wrap{
+        margin-right: 0;
+      }
+
+      svg{
+        margin-right:.75em;
+      }
+    }
+    .ant-tabs-tab{
+      display: flex;
+      justify-content: start;
+      align-items: center;
+      margin-bottom: 0.5rem;
+      width: 13.5rem;
+      height: 2.8125rem;
+      background: #fff;
+      font-size: 1.125rem;
+      
+    }
+    .ant-tabs-left-content{
+      border: 0;
+    }
+    .ant-tabs-tab-active{
+      background: #1890FF;
+      color: #fff;
+    }
+    .ant-tabs-ink-bar{
+      display: none !important;
+    }
+  }
+  
+  .notice-sort-nav{
+    display: flex;
+    justify-content: space-between;
+    padding: .3rem 2rem 1.5rem;
+    margin: 0px -1.25rem;
+    border-bottom: 1px solid #E0E0E0;
+    .ant-input:hover{
+      border-color: #4154f1;
+    }
+    .ant-btn-primary{
+      background-color: #4154f1;
+      &:hover{
+        opacity: 0.8;
+      }
+    }
+  }
+
+  .notice-center-content{
+    padding:1.25rem;
+    background: #fff;
+    flex: auto;
+  }
+
+  .item-head-title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 1.25rem 0 .6rem 0;
+    .item-head-title-content{
+      display: flex;
+      align-items: center;
+      font-size: 1rem;
+      span{
+        font-weight: bold;
+      }
+      i{
+        margin-right: .25em;
+        color: #4154f1;
+      }
+    }
+  }
+
+  .ant-input-group-addon{
+    border: 0 !important;
+  }
+
+  .item-head-title{
+    border-bottom: 1px solid #E5E5E5;
+  }
+
+}
+
+.center-right-but{
+  caret-color: rgba(0, 0, 0, 0);
+  .piece{
+    margin:0 .8rem;
+    color: #aaa;
+  }
+  .sortLink{
+    color: #333;
+    cursor: pointer;
+    &:hover{
+      color: #4154f1;
+    }
+    &.active{
+      color: #4154f1;
+    }
+  }
+}
+
+.body{
+  display: flex;
+  justify-content: space-between;
+  margin-top: -20px;
+
+  .navigationMenu{
+    margin-right: 20px;
+    width: 20.8em;
+    caret-color: rgba(0, 0, 0, 0);
+    .menu-ul:last-child{
+      margin-top: 12px;
+    }
+  }
+
+  .none_p_title{
+    text-align: center;
+  }
+}
+
+.menu-ul{
+  background-color: white;
+  margin-bottom: 12px;
+  border-radius:2px;
+
+  .MenuTitle{
+    border-bottom: 1px solid #E0E0E0;
+
+    span{
+      display: block;
+      width: 50%;
+      height: 100%;
+      cursor: pointer;
+      border-bottom: 0px solid;
+      i{
+        color: #afaaae;
+      }
+    }
+
+    span:hover{
+      color: #4154f1;
+      .iconfont{
+        color: #4154f1 !important;
+      }
+    }
+  }
+
+  li{
+    padding:0px 0px 0px 20px;
+    position: relative;
+    height: 62px;
+    line-height: 62px;
+    font-size: 16px;
+    color: #333;
+    span{
+      display: block;
+      height: 62px; 
+      cursor: pointer;
+      border-bottom: 1px solid #eee;
+    }
+
+    &:last-child > span{
+      border-bottom: none;
+    }
+  }
+
+  li:hover{
+    background: #fafafa;
+  }
+
+  .active{
+    background-color: #fafafa;
+    & ::before{
+      position: absolute;
+      left: 0px;
+      top: 15px;
+      width: 6px;
+      content: '';
+      height: 30px;
+      background: #4154f1;
+    }
+  }
+
+  & i{
+    margin-right: 5px;
+  }
+}
+
+.ant-input-group-addon .ant-btn-lg {
+  height: 40px;
+}
+
+.edu-txt-center .ant-pagination {
+  margin: 2rem auto;
+  text-align: center;
+  .ant-pagination-item:focus, .ant-pagination-item:hover, .ant-pagination-item-active, .ant-pagination-prev:hover a, .ant-pagination-next:hover a, .ant-pagination-options-quick-jumper input:focus, .ant-pagination-options-quick-jumper input:hover{
+    border-color: #4154f1;
+  }
+  .ant-pagination-disabled{
+    & a, & :hover a, & :focus a, & .ant-pagination-item-link, &:hover .ant-pagination-item-link , &:focus .ant-pagination-item-link {
+      color: rgba(0, 0, 0, 0.25) !important;
+      border-color: #d9d9d9;
+    }
+  }
+  .ant-pagination-item-active a{
+    color: #4154f1
+  }
+}
\ No newline at end of file

From fc3ed72f21adf18e8799e12f99c909fbf2e1c2ee Mon Sep 17 00:00:00 2001
From: unknown <2569982966@qq.com>
Date: Thu, 16 Nov 2023 13:49:54 +0800
Subject: [PATCH 02/12] fix

---
 .idea/workspace.xml         | 2 +-
 src/App.js                  | 2 +-
 src/military/achievement.js | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0b803d869..21c5881bc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -245,7 +245,7 @@
       <workItem from="1587870344748" duration="138000" />
       <workItem from="1587882941476" duration="4365000" />
       <workItem from="1587891008299" duration="390000" />
-      <workItem from="1700037429191" duration="1219000" />
+      <workItem from="1700037429191" duration="3288000" />
     </task>
     <servers />
   </component>
diff --git a/src/App.js b/src/App.js
index d76861a22..ef8dd4955 100644
--- a/src/App.js
+++ b/src/App.js
@@ -396,7 +396,7 @@ class App extends Component {
 
               {/*成果*/}
               <Route
-                path={"/achievementOverview"}
+                path={"/achievement"}
                 render={
                   (props) => {
                     return (<Achievement {...this.props} {...props} {...this.state} />)
diff --git a/src/military/achievement.js b/src/military/achievement.js
index 55ceb29d2..b0654a836 100644
--- a/src/military/achievement.js
+++ b/src/military/achievement.js
@@ -43,15 +43,14 @@ class Index extends Component {
           ></Route>
 
           <Route
-            path="/achievement"
+            path="/achievement/list"
             render={(props) => (
               <NoticeList {...this.props} {...props} />
             )}
           ></Route>
 
-
             <Route
-                path="/achievementOverview"
+                path="/achievement/overview"
                 render={(props) => (
                     <Overview {...this.props} {...props} />
                 )}

From 386d381d69e37eb20c553ad76a0e2cd8e2774d87 Mon Sep 17 00:00:00 2001
From: zhangxiaozhuozhuo <7658685+zhangxiaozhuozhuo@user.noreply.gitee.com>
Date: Fri, 17 Nov 2023 16:41:03 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement.js                   |  11 +
 src/military/achievement/achivChart/index.jsx | 113 +++++++++
 .../achievement/achivChart/index.scss         | 125 +++++++++
 src/military/achievement/achivList/index.jsx  |  12 +
 src/military/achievement/achivList/index.scss |   5 +
 src/military/achievement/image/banner_new.svg |   1 +
 .../achievement/image/left_bot_icon.png       | Bin 0 -> 1766 bytes
 .../achievement/image/left_top_icon.png       | Bin 0 -> 1965 bytes
 src/military/achievement/noticeList/index.jsx |   2 -
 src/military/achievement/overview/index.jsx   | 240 +++---------------
 src/military/achievement/overview/index.scss  | 238 +++--------------
 11 files changed, 329 insertions(+), 418 deletions(-)
 create mode 100644 src/military/achievement/achivChart/index.jsx
 create mode 100644 src/military/achievement/achivChart/index.scss
 create mode 100644 src/military/achievement/achivList/index.jsx
 create mode 100644 src/military/achievement/achivList/index.scss
 create mode 100644 src/military/achievement/image/banner_new.svg
 create mode 100644 src/military/achievement/image/left_bot_icon.png
 create mode 100644 src/military/achievement/image/left_top_icon.png

diff --git a/src/military/achievement.js b/src/military/achievement.js
index b0654a836..c8929bcaf 100644
--- a/src/military/achievement.js
+++ b/src/military/achievement.js
@@ -17,6 +17,10 @@ const Overview = Loadable({
     loading: Loading,
 });
 
+const AchivChart = Loadable({
+  loader: () => import("./achievement/achivChart"),
+  loading: Loading,
+});
 
 const NoticeList = Loadable({
   loader: () => import("./achievement/noticeList"),
@@ -42,6 +46,13 @@ class Index extends Component {
             )}
           ></Route>
 
+          <Route
+            path="/achievement/chart"
+            render={(props) => (
+              <AchivChart {...this.props} {...props} />
+            )}
+          ></Route>
+
           <Route
             path="/achievement/list"
             render={(props) => (
diff --git a/src/military/achievement/achivChart/index.jsx b/src/military/achievement/achivChart/index.jsx
new file mode 100644
index 000000000..eb3b4b41e
--- /dev/null
+++ b/src/military/achievement/achivChart/index.jsx
@@ -0,0 +1,113 @@
+import React, { useEffect } from 'react';
+import echarts from 'echarts';
+import './index.scss';
+import topCountPng from '../image/left_top_icon.png';
+import botCountPng from '../image/left_bot_icon.png';
+
+function AchivChart() {
+  useEffect(() => {
+    // 基于准备好的dom，初始化echarts实例
+    const myChart = echarts.init(document.getElementById('chartBox'));
+
+    // 指定图表的配置项和数据
+    const option = {
+      title: {
+        text: '成果数量占比统计',
+        left: 'center',
+        top: 350,
+        textStyle: {
+          fontSize: 18
+        }
+      },
+      legend: {
+        orient: 'vertical',
+        right: 30,
+        top: 85,
+        itemGap: 16,
+        itemWidth: 32,
+        itemHeight: 24,
+        textStyle: {
+          fontSize: 16
+        }
+      },
+      color: [
+        'rgba(183, 88, 255, 1)',
+        'rgba(255, 190, 56, 1)',
+        'rgba(240, 68, 95, 1)',
+        'rgba(88, 113, 255, 1)',
+        'rgba(36, 185, 168, 1)',
+        'rgba(88, 183, 255, 1)'
+      ],
+      series: [
+        {
+          name: 'Nightingale Chart',
+          type: 'pie',
+          radius: [35, 160],
+          center: ['150', '50%'],
+          roseType: 'area',
+          clockwise: true,
+          startAngle: 45,
+          label: {
+            show: false
+          },
+          itemStyle: {
+            borderRadius: 0
+          },
+          data: [
+            { value: 19, name: '开源项目 10%' },
+            { value: 28, name: '创客任务 20%' },
+            { value: 32, name: '开放竞赛 25%' },
+            { value: 45, name: '科研成果 32%' },
+            { value: 52, name: '装备成果 40%' },
+            { value: 66, name: '其他成果 50%' }
+          ]
+        }
+      ],
+      graphic: {
+        type: 'text',
+        left: '133',
+        top: 'middle',
+        style: {
+          text: '成果\n类型',
+          fill: '#333',
+          fontSize: 18,
+          fontWeight: 'bold',
+          verticalAlign: 'middle',
+          lineHeight: 24
+        }
+      }
+    };
+
+    // 使用刚指定的配置项和数据显示图表。
+    myChart.setOption(option);
+  }, []);
+
+  return (
+    <div id='mainContent'>
+      <div id='leftBox'>
+        <div className='count-top'>
+          <div className="count-icon">
+            <img alt="icon" src={topCountPng}></img>
+          </div>
+          <div className='count-main'>
+            <p id='count-num'>5896</p>
+            <p className='count-title'>收录成果数</p>
+          </div>
+        </div>
+        <div className='count-bot'>
+          <div className="count-icon">
+            <img alt="icon" src={botCountPng}></img>
+          </div>
+          <div className='count-main'>
+            <p id='count-num'>159</p>
+            <p className='count-title'>成果总浏览数</p>
+          </div>
+        </div>
+      </div>
+      <div id="chartBox"></div>
+      <div id="blankBox"></div>
+    </div>
+  )
+}
+
+export default AchivChart;
diff --git a/src/military/achievement/achivChart/index.scss b/src/military/achievement/achivChart/index.scss
new file mode 100644
index 000000000..99f7b4235
--- /dev/null
+++ b/src/military/achievement/achivChart/index.scss
@@ -0,0 +1,125 @@
+
+#mainContent {
+    margin: 40px auto 0 auto;
+    width: 1200px;
+    height: 450px;
+    display: flex;
+    background:linear-gradient(97.82deg,#f3f5f8 0%,rgba(255, 255, 255, 0) 100%);
+    box-shadow:8px 6px 18px rgba(171, 202, 255, 0.24) inset;
+
+    #leftBox {
+        width: 500px;
+        height: 450px; 
+        position: relative;
+        .count-top {
+            display: flex;
+            width: 180px;
+            height: 95px;
+            position: absolute;
+            top: 87px;
+            right: 130px;
+            background:#f7faff;
+            box-sizing: border-box;
+            border:1px solid;
+            border-color:rgba(13, 94, 248, 0.16);
+            border-radius:6px;
+            .count-icon {
+                width: 80px;
+                height: 95px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                img {
+                    width: 36px;
+                    height: 36px;
+                }
+            }
+            .count-main {
+                width: 100px;
+                height: 95px;
+                display: flex;
+                flex-direction: column;
+                #count-num {
+                    width: 100%;
+                    height: 55px;
+                    line-height: 55px;
+                    // font-family:Alibaba PuHuiTi;
+                    font-weight:600;
+                    color:#283444;
+                    font-size:24px;
+                    letter-spacing:2px;
+                }
+                // .count-title {
+                //     width: 100%;
+                //     height: 40px;
+                //     line-height: 40px;
+                //     // font-family:Alibaba PuHuiTi;
+                //     color:#445a7a;
+                //     font-size:15px;
+                //     letter-spacing:50px;
+                // }
+            }
+        }
+        .count-bot {
+            display: flex;
+            width: 180px;
+            height: 95px;
+            position: absolute;
+            top: 227px;
+            right: 130px;
+            background:#f7faff;
+            box-sizing: border-box;
+            border:1px solid;
+            border-color:rgba(13, 94, 248, 0.16);
+            border-radius:6px;
+            .count-icon {
+                width: 80px;
+                height: 95px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                img {
+                    width: 36px;
+                    height: 36px;
+                }
+            }
+            .count-main {
+                width: 100px;
+                height: 95px;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+                #count-num {
+                    width: 100%;
+                    height: 55px;
+                    // font-family:Alibaba PuHuiTi;
+                    font-weight:600;
+                    color:#283444;
+                    font-size:24px;
+                    line-height: 30px;
+                    letter-spacing:2px;
+                }
+                .count-title {
+                    width: 100%;
+                    height: 40px;
+                    // font-family:Alibaba PuHuiTi;
+                    color:#445a7a;
+                    font-size:15px;
+                    line-height: 20px;
+                    letter-spacing:1px;
+                }
+            }
+        }
+    }
+    #chartBox {
+        width: 500px;
+        height: 450px;
+    }
+    #blankBox {
+        width: 200px;
+        height: 450px;
+    }
+}
+
+
diff --git a/src/military/achievement/achivList/index.jsx b/src/military/achievement/achivList/index.jsx
new file mode 100644
index 000000000..34d641521
--- /dev/null
+++ b/src/military/achievement/achivList/index.jsx
@@ -0,0 +1,12 @@
+import React, { useEffect } from 'react';
+import './index.scss';
+
+function AchivList() {
+  useEffect(() => {
+    console.log('进来成果列表页面了')
+  }, []);
+
+  return <div id="listBox">成果列表页面。。。</div>;
+}
+
+export default AchivList;
diff --git a/src/military/achievement/achivList/index.scss b/src/military/achievement/achivList/index.scss
new file mode 100644
index 000000000..34bedafa5
--- /dev/null
+++ b/src/military/achievement/achivList/index.scss
@@ -0,0 +1,5 @@
+
+#listBox {
+    width: 800px;
+    height: 600px;
+}
\ No newline at end of file
diff --git a/src/military/achievement/image/banner_new.svg b/src/military/achievement/image/banner_new.svg
new file mode 100644
index 000000000..10ea325cc
--- /dev/null
+++ b/src/military/achievement/image/banner_new.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="960" height="347" viewBox="0 0 960 347"><defs><filter id="master_svg0_3_6303/3_5403" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-20" y="-16" width="305" height="59"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="4" dx="0"/><feGaussianBlur stdDeviation="5"/><feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="master_svg1_3_6303/3_5387" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-20" y="-16" width="318" height="67"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="4" dx="0"/><feGaussianBlur stdDeviation="5"/><feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg2_3_6303/3_5409"><rect x="47" y="21" width="358" height="326" rx="0"/></clipPath><linearGradient x1="0.5000070929527283" y1="-0.000003032694621651899" x2="0.5000070929527283" y2="1" id="master_svg3_3_5539"><stop offset="0%" stop-color="#DBE2FD" stop-opacity="1"/><stop offset="10.999999940395355%" stop-color="#B7C9FB" stop-opacity="0.800000011920929"/><stop offset="23.999999463558197%" stop-color="#91AFF9" stop-opacity="0.5899999737739563"/><stop offset="37.00000047683716%" stop-color="#7098F8" stop-opacity="0.4099999964237213"/><stop offset="50%" stop-color="#5585F6" stop-opacity="0.25999999046325684"/><stop offset="62.99999952316284%" stop-color="#4077F5" stop-opacity="0.15000000596046448"/><stop offset="75%" stop-color="#316CF5" stop-opacity="0.07000000029802322"/><stop offset="87.99999952316284%" stop-color="#2866F4" stop-opacity="0.019999999552965164"/><stop offset="100%" stop-color="#2564F4" stop-opacity="0"/></linearGradient><linearGradient x1="0.49998682737350464" y1="0.9999822378158569" x2="0.49998682737350464" y2="1.554312234475219e-14" id="master_svg4_3_5531"><stop offset="0%" stop-color="#DBE2FD" stop-opacity="1"/><stop offset="10.999999940395355%" stop-color="#B7C9FB" stop-opacity="0.800000011920929"/><stop offset="23.999999463558197%" stop-color="#91AFF9" stop-opacity="0.5899999737739563"/><stop offset="37.00000047683716%" stop-color="#7098F8" stop-opacity="0.4099999964237213"/><stop offset="50%" stop-color="#5585F6" stop-opacity="0.25999999046325684"/><stop offset="62.99999952316284%" stop-color="#4077F5" stop-opacity="0.15000000596046448"/><stop offset="75%" stop-color="#316CF5" stop-opacity="0.07000000029802322"/><stop offset="87.99999952316284%" stop-color="#2866F4" stop-opacity="0.019999999552965164"/><stop offset="100%" stop-color="#2564F4" stop-opacity="0"/></linearGradient><linearGradient x1="0.4999828636646271" y1="0.9999809265136719" x2="0.4999828636646271" y2="0.000029093740522512235" id="master_svg5_3_5535"><stop offset="0%" stop-color="#DBE2FD" stop-opacity="1"/><stop offset="10.999999940395355%" stop-color="#B7C9FB" stop-opacity="0.800000011920929"/><stop offset="23.999999463558197%" stop-color="#91AFF9" stop-opacity="0.5899999737739563"/><stop offset="37.00000047683716%" stop-color="#7098F8" stop-opacity="0.4099999964237213"/><stop offset="50%" stop-color="#5585F6" stop-opacity="0.25999999046325684"/><stop offset="62.99999952316284%" stop-color="#4077F5" stop-opacity="0.15000000596046448"/><stop offset="75%" stop-color="#316CF5" stop-opacity="0.07000000029802322"/><stop offset="87.99999952316284%" stop-color="#2866F4" stop-opacity="0.019999999552965164"/><stop offset="100%" stop-color="#2564F4" stop-opacity="0"/></linearGradient><linearGradient x1="0.4999646544456482" y1="1.0000404119491577" x2="0.4999646544456482" y2="-0.00001010758842312498" id="master_svg6_3_5433"><stop offset="0%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="50%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="80.0000011920929%" stop-color="#F4F7FF" stop-opacity="1"/><stop offset="100%" stop-color="#E9EEFF" stop-opacity="1"/></linearGradient><linearGradient x1="-0.02693263255059719" y1="0.5004622340202332" x2="1.0000234842300415" y2="0.5004622340202332" id="master_svg7_3_5437"><stop offset="20.000000298023224%" stop-color="#E0E6FD" stop-opacity="1"/><stop offset="51.99999809265137%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="85.00000238418579%" stop-color="#F4F6FE" stop-opacity="1"/><stop offset="94.9999988079071%" stop-color="#E6EBFE" stop-opacity="1"/><stop offset="100%" stop-color="#DBE2FD" stop-opacity="1"/></linearGradient><linearGradient x1="-0.0001056427790899761" y1="0.50038743019104" x2="1.0002257823944092" y2="0.50038743019104" id="master_svg8_3_5449"><stop offset="20.000000298023224%" stop-color="#E0E6FD" stop-opacity="1"/><stop offset="51.99999809265137%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="85.00000238418579%" stop-color="#F4F6FE" stop-opacity="1"/><stop offset="94.9999988079071%" stop-color="#E6EBFE" stop-opacity="1"/><stop offset="100%" stop-color="#DBE2FD" stop-opacity="1"/></linearGradient><linearGradient x1="5.3290705182007514e-14" y1="0.5004790425300598" x2="1.0002350807189941" y2="0.5004790425300598" id="master_svg9_3_5454"><stop offset="20.000000298023224%" stop-color="#E0E6FD" stop-opacity="1"/><stop offset="51.99999809265137%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="85.00000238418579%" stop-color="#F4F6FE" stop-opacity="1"/><stop offset="94.9999988079071%" stop-color="#E6EBFE" stop-opacity="1"/><stop offset="100%" stop-color="#DBE2FD" stop-opacity="1"/></linearGradient><linearGradient x1="-4.440892098500626e-15" y1="0.5009425282478333" x2="1.0002453327178955" y2="0.5009425282478333" id="master_svga_3_5446"><stop offset="20.000000298023224%" stop-color="#E0E6FD" stop-opacity="1"/><stop offset="51.99999809265137%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="85.00000238418579%" stop-color="#F4F6FE" stop-opacity="1"/><stop offset="94.9999988079071%" stop-color="#E6EBFE" stop-opacity="1"/><stop offset="100%" stop-color="#DBE2FD" stop-opacity="1"/></linearGradient><linearGradient x1="-0.0003051801468245685" y1="0.49956196546554565" x2="1" y2="0.49956196546554565" id="master_svgb_3_5510"><stop offset="0%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="50%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="80.0000011920929%" stop-color="#F4F7FF" stop-opacity="1"/><stop offset="100%" stop-color="#E9EEFF" stop-opacity="1"/></linearGradient><linearGradient x1="0.00014082933194004" y1="0.4999307692050934" x2="0.9999992847442627" y2="0.4999307692050934" id="master_svgc_3_5497"><stop offset="0%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="50%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="80.0000011920929%" stop-color="#F4F7FF" stop-opacity="1"/><stop offset="100%" stop-color="#E9EEFF" stop-opacity="1"/></linearGradient><linearGradient x1="1.5543122344752192e-15" y1="0.5041092038154602" x2="1.0000314712524414" y2="0.5041092038154602" id="master_svgd_3_5487"><stop offset="20.000000298023224%" stop-color="#E0E6FD" stop-opacity="1"/><stop offset="51.99999809265137%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="85.00000238418579%" stop-color="#F4F6FE" stop-opacity="1"/><stop offset="94.9999988079071%" stop-color="#E6EBFE" stop-opacity="1"/><stop offset="100%" stop-color="#DBE2FD" stop-opacity="1"/></linearGradient><linearGradient x1="0.4998365044593811" y1="0.0009348471066914499" x2="0.4998365044593811" y2="1.0004279613494873" id="master_svge_3_5490"><stop offset="0%" stop-color="#2564F4" stop-opacity="1"/><stop offset="23.999999463558197%" stop-color="#2362F0" stop-opacity="1"/><stop offset="47.999998927116394%" stop-color="#1D5DE3" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#1254CF" stop-opacity="1"/><stop offset="98.00000190734863%" stop-color="#0347B2" stop-opacity="1"/><stop offset="100%" stop-color="#0246AF" stop-opacity="1"/></linearGradient><linearGradient x1="0.5001042485237122" y1="0.001918365596793592" x2="0.5001042485237122" y2="0.9999480843544006" id="master_svgf_3_5494"><stop offset="0%" stop-color="#2564F4" stop-opacity="1"/><stop offset="23.999999463558197%" stop-color="#2362F0" stop-opacity="1"/><stop offset="47.999998927116394%" stop-color="#1D5DE3" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#1254CF" stop-opacity="1"/><stop offset="98.00000190734863%" stop-color="#0347B2" stop-opacity="1"/><stop offset="100%" stop-color="#0246AF" stop-opacity="1"/></linearGradient><linearGradient x1="0.4997660219669342" y1="-0.00006689420115435496" x2="0.4997660219669342" y2="1.0003960132598877" id="master_svgg_3_5500"><stop offset="0%" stop-color="#2564F4" stop-opacity="1"/><stop offset="23.999999463558197%" stop-color="#2362F0" stop-opacity="1"/><stop offset="47.999998927116394%" stop-color="#1D5DE3" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#1254CF" stop-opacity="1"/><stop offset="98.00000190734863%" stop-color="#0347B2" stop-opacity="1"/><stop offset="100%" stop-color="#0246AF" stop-opacity="1"/></linearGradient><linearGradient x1="0.4998018145561218" y1="0.000016183465049834922" x2="0.4998018145561218" y2="1" id="master_svgh_3_5478"><stop offset="0%" stop-color="#2564F4" stop-opacity="1"/><stop offset="23.999999463558197%" stop-color="#2362F0" stop-opacity="1"/><stop offset="47.999998927116394%" stop-color="#1D5DE3" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#1254CF" stop-opacity="1"/><stop offset="98.00000190734863%" stop-color="#0347B2" stop-opacity="1"/><stop offset="100%" stop-color="#0246AF" stop-opacity="1"/></linearGradient><linearGradient x1="0.00006929817755008116" y1="0.5017735958099365" x2="1.0013586282730103" y2="0.5017735958099365" id="master_svgi_3_5420"><stop offset="20.000000298023224%" stop-color="#E0E6FD" stop-opacity="1"/><stop offset="51.99999809265137%" stop-color="#FFFFFF" stop-opacity="1"/><stop offset="73.00000190734863%" stop-color="#FCFDFF" stop-opacity="1"/><stop offset="85.00000238418579%" stop-color="#F4F6FE" stop-opacity="1"/><stop offset="94.9999988079071%" stop-color="#E6EBFE" stop-opacity="1"/><stop offset="100%" stop-color="#DBE2FD" stop-opacity="1"/></linearGradient><clipPath id="master_svgj_3_6303/3_5408"><rect x="0" y="0" width="67" height="141" rx="0"/></clipPath></defs><g><g filter="url(#master_svg0_3_6303/3_5403)"><path d="M707.808,208.216L709.032,199.36L678.936,199.36L677.712,208.216L674.76,209.584L666.552,209.584L668.856,193.168L720.84,193.168L718.5360000000001,209.584L710.328,209.584L707.808,208.216ZM692.112,212.608L681.168,217.648L661.944,217.648L686.136,206.488L686.856,201.376L700.5360000000001,201.376L699.816,206.488L720.768,217.648L701.616,217.648L692.112,212.608ZM700.032,168.544L724.296,168.544L723.36,175.38400000000001L720.696,179.488L709.752,179.488L712.704,174.664L696.936,174.664L695.856,176.752L684.84,176.752L689.448,167.824L687.792,165.808L701.472,165.808L700.032,168.544ZM702.984,184.168L697.512,190.432L684.336,190.432L695.496,177.472L708.744,177.472L705.792,180.856L713.856,180.856L721.272,190.432L707.88,190.432L702.984,184.168ZM677.856,190.432L666.552,190.432L672.024,177.4L683.4,177.4L677.856,190.432ZM683.688,175.38400000000001L672.024,175.38400000000001L669.792,167.176L681.384,167.176L683.688,175.38400000000001ZM762.24,217.648L766.92,210.952L768.576,198.64L757.776,198.64L760.656,177.904L769.224,177.904L771.168,175.024L780.456,175.024L778.5840000000001,177.904L790.392,177.904L787.512,198.64L777.72,198.64L775.776,212.89600000000002Q775.488,214.984,774.372,216.316Q773.256,217.648,771.816,217.648L762.24,217.648ZM792.408,167.176L791.544,173.368L759.72,173.368L751.944,217.648L742.44,217.648L750.936,169.768L749.496,167.176L792.408,167.176ZM726.312,217.648L732.936,197.272L744.24,197.272L737.616,217.648L726.312,217.648ZM733.44,194.536L732.648,182.224003L744.024,182.224003L744.816,194.536L733.44,194.536ZM735.528,179.488L734.736,167.176L746.112,167.176L746.904,179.488L735.528,179.488ZM786.288,201.304L786.504,216.352L779.376,216.352L779.16,201.304L786.288,201.304ZM765.768,201.304L761.232,216.424L754.176,216.424L758.784,201.304L765.768,201.304ZM780.888,193.024L781.248,190.504L766.344,190.504L765.984,193.024L780.888,193.024ZM766.992,185.968L781.896,185.968L782.256,183.448L767.352,183.448L766.992,185.968ZM806.232,191.8L807.672,181.504002L800.832,181.504002L801.768,174.736L808.608,174.736L809.472,168.544L807.168,165.808L823.5840000000001,165.808L822.288,174.736L835.968,174.736L836.832,168.544L834.528,165.808L850.944,165.808L849.648,174.736L856.488,174.736L855.552,181.504002L848.712,181.504002L847.2719999999999,191.8L856.848,191.8L855.912,198.64L795.72,198.64L796.656,191.8L806.232,191.8ZM851.736,217.648L836.76,217.648L831,200.728L846.048,200.728L851.736,217.648ZM809.328,217.648L794.352,217.648L805.08,200.728L820.056,200.728L809.328,217.648ZM819.912,191.8L833.592,191.8L835.032,181.504002L821.352,181.504002L819.912,191.8ZM881.904,212.392L882.624,207.208L860.592,207.208L861.456,201.016L885.576,201.016L893.424,197.992L867.504,197.992L868.3679999999999,191.584L916.1759999999999,191.584L915.168,198.064L905.664,201.016L918.8399999999999,201.016L917.976,207.208L897.312,207.208L896.376,213.904Q896.16,215.488,894.612,216.53199999999998Q893.064,217.576,890.976,217.576L875.784,217.576L881.904,212.392ZM918.192,176.824L916.392,189.712L867,189.712L868.8,176.824L918.192,176.824ZM887.664,169.12L887.736,168.61599999999999L885.36,165.952L902.856,165.952L902.424,169.12L923.0160000000001,169.12L922.2239999999999,174.664L866.208,174.664L867,169.12L887.664,169.12ZM903.432,185.032L903.936,181.576L881.76,181.576L881.256,185.032L903.432,185.032Z" fill="#2564F4" fill-opacity="1"/></g><g filter="url(#master_svg1_3_6303/3_5387)"><path d="M452.664,108.952L455.328,89.8L450,89.8L444.816,115.648L432.504,115.648L441.072,73.24L438.84,70.648L466.344,70.648L465.12,66.184L463.104,63.808L476.784,63.808L478.656,70.648L497.664,70.648L496.728,77.488L480.6,77.488L484.704,92.32L493.992,87.064L492.696,96.64L486.864,99.952L489.024,107.584L491.112,107.584L494.28,104.848L492.696,115.648L479.016,115.648L476.28,105.856L465.912,111.688L467.28,102.112L474.12,98.29599999999999L468.288,77.488L452.52,77.488L451.368,82.96L467.20799999999997,82.96L463.896,106.792Q463.536,108.88,461.952,110.28399999999999Q460.368,111.688,458.28,111.688L449.496,111.688L452.664,108.952ZM495.144,69.28L481.464,69.28L480.744,64.528L494.424,64.528L495.144,69.28ZM499.824,114.424L514.152,96.64L503.712,96.64L504.648,89.8L526.5360000000001,89.8L526.968,87.064L507.81600000000003,87.064L510.48,67.912L508.104,65.176L562.8240000000001,65.176L559.8,87.064L540.648,87.064L540.216,89.8L562.104,89.8L561.168,96.64L550.656,96.64L560.016,114.424L546.336,114.424L538.776,100.096L536.616,115.648L522.936,115.648L525.096,100.024L513.504,114.424L499.824,114.424ZM527.688,81.592L528.12,78.856L521.208,78.856L520.848,81.592L527.688,81.592ZM542.952,70.648L542.52,73.384L549.36,73.384L549.792,70.648L542.952,70.648ZM522,73.384L528.84,73.384L529.272,70.648L522.432,70.648L522,73.384ZM548.208,81.592L548.568,78.856L541.8,78.856L541.3679999999999,81.592L548.208,81.592ZM574.344,77.488L573.336,65.176L585.648,65.176L586.656,77.488L574.344,77.488ZM572.256,92.536L571.248,80.224003L583.56,80.224003L584.568,92.536L572.256,92.536ZM564.192,115.648L571.896,95.272L584.208,95.272L576.504,115.648L564.192,115.648ZM584.568,114.352L591.12,68.056L588.168,65.104L631.08,65.104L630.144,72.16L603.216,72.16L598.248,107.368L625.1759999999999,107.368L624.168,114.352L584.568,114.352ZM632.232,100.744L643.8240000000001,97.21600000000001L632.736,97.36L633.528,91.888L694.008,90.664L693.144,96.352L668.448,96.78399999999999L668.232,97.936L673.056,97.936L678.24,103.19200000000001L681.264,99.304L692.784,99.304L686.232,107.656L682.704,107.656L690.48,115.50399999999999L679.5360000000001,115.50399999999999L667.5840000000001,102.832L665.784,115.648L654.84,115.648L655.992,107.29599999999999L630.216,115.50399999999999L631.152,108.952L657,100.384L657.216,98.944L631.2239999999999,107.656L632.232,100.744ZM664.1279999999999,87.856L661.4639999999999,88L661.248,89.8L651.528,89.8L651.744,88.432L633.888,89.152L634.752,83.392L637.344,83.32L639.288,69.856L636.624,69.856L637.2719999999999,65.104L667.296,65.104L666.648,69.856L664.056,69.856L662.328,82.24L664.92,82.096L664.1279999999999,87.856ZM677.808,72.736L681.048,76.19200000000001L686.52,71.368L667.8720000000001,71.368L668.736,65.176L697.4639999999999,65.176L696.384,73.168L686.448,81.952L693.9359999999999,89.8L682.056,89.8L679.968,87.64L677.52,89.8L665.496,89.8L674.424,81.952L667.44,74.752L667.7280000000001,72.736L677.808,72.736ZM648.792,71.944L654.048,71.944L654.336,69.856L649.08,69.856L648.792,71.944ZM648,77.416L653.256,77.416L653.472,75.976L648.216,75.976L648,77.416ZM647.208,82.888L652.5360000000001,82.672L652.6800000000001,81.448L647.424,81.448L647.208,82.888Z" fill="#2564F4" fill-opacity="1"/></g><g clip-path="url(#master_svg2_3_6303/3_5409)"><g><g><g><g><path d="M253.42887579345702,290.338222243309C249.77087579345704,290.338222243309,246.12187579345704,289.535222243309,243.32387579345703,287.926222243309L105.40376579345703,208.40782224330903C102.48099579345703,206.72102224330902,100.86918145345703,204.41182224330902,100.86488563121704,201.90942224330902C100.86058981345703,199.40702224330903,102.45091579345703,197.12352224330903,105.33929579345703,195.44522224330902L242.36087579345704,115.92722224330902C247.90987579345702,112.70803824330902,256.97487579345704,112.70374824330902,262.562875793457,115.92722224330902L400.46087579345703,195.44102224330902C403.38387579345704,197.12782224330903,404.995875793457,199.432722243309,404.999875793457,201.93942224330902C405.00387579345704,204.44612224330902,403.413875793457,206.72962224330902,400.52587579345703,208.40782224330903L263.50387579345704,287.926222243309C260.731875793457,289.535222243309,257.081875793457,290.338222243309,253.42887579345702,290.338222243309ZM252.45287579345703,115.72548224330902C249.20787579345702,115.72548224330902,245.96287579345704,116.43799224330903,243.49987579345702,117.87160224330903L106.46971579345703,197.38532224330902C104.32062579345703,198.64302224330902,103.11283579345704,200.24832224330902,103.11283579345704,201.90512224330902C103.11283579345704,203.56192224330903,104.32921579345702,205.19292224330903,106.52988579345703,206.46342224330903L244.44987579345704,285.98122224330905C249.40987579345702,288.84022224330903,257.447875793457,288.84022224330903,262.37387579345705,285.98122224330905L399.394875793457,206.46342224330903C401.543875793457,205.205822243309,402.756875793457,203.600522243309,402.75187579345703,201.94372224330903C402.747875793457,200.28692224330902,401.535875793457,198.65162224330902,399.338875793457,197.38532224330902L261.418875793457,117.86730224330903C258.93887579345704,116.43799224330903,255.68987579345702,115.72548224330902,252.45287579345703,115.72548224330902Z" fill="url(#master_svg3_3_5539)" fill-opacity="1"/></g></g><g><g><path d="M282.1106183105469,347.0000698507309C280.13381831054687,347.0330698507309,278.1818183105469,346.5586698507309,276.4413183105469,345.62216985073087L202.6156883105469,303.0603698507309C200.89641231054688,302.0645698507309,199.92501831054688,300.6652698507309,199.92501831054688,299.1329698507309C199.92501831054688,297.6006698507309,200.86632131054688,296.2142698507309,202.58128831054688,295.2227698507309L275.92121831054686,252.6565898507309C279.0889183105469,250.8194968507309,284.06191831054684,250.8194968507309,287.2469183105469,252.6565898507309L361.0680183105469,295.2184698507309C362.78701831054684,296.2185698507309,363.7550183105469,297.6134698507309,363.7590183105469,299.1500698507309C363.76301831054684,300.6866698507309,362.8180183105469,302.0645698507309,361.1030183105469,303.0603698507309L287.76271831054686,345.62216985073087C286.0287183105469,346.5593698507309,284.0819183105469,347.0339698507309,282.1106183105469,347.0000698507309ZM281.5819183105469,253.5321998507309C280.0067183105469,253.4971398507309,278.44861831054686,253.8650398507309,277.0559183105469,254.6009598507309L203.71172831054687,297.1628698507309C202.73174831054686,297.7293698507309,202.17298831054688,298.4504698507309,202.17298831054688,299.1286698507309C202.17298831054688,299.8068698507309,202.74463831054686,300.5451698507309,203.74181831054688,301.1159698507309L277.5631183105469,343.6778698507309C280.0303183105469,345.1028698507309,284.18231831054686,345.1028698507309,286.6323183105469,343.6778698507309L359.9720183105469,301.1159698507309C360.95201831054686,300.5493698507309,361.5110183105469,299.8282698507309,361.5110183105469,299.1458698507309C361.5110183105469,298.4633698507309,360.9390183105469,297.7336698507309,359.94201831054687,297.1584698507309L286.1208183105469,254.6009598507309C284.7218183105469,253.86540985073088,283.15831831054686,253.4976198507309,281.5776183105469,253.5321998507309L281.5819183105469,253.5321998507309Z" fill="url(#master_svg4_3_5531)" fill-opacity="1"/></g></g><g><g><path d="M110.1489,301.10309029750823C108.59020000000001,301.13019029750825,107.05080000000001,300.75629029750826,105.6788,300.01719029750825L49.19207,267.45189029750827C47.799462,266.64929029750823,47,265.4688902975082,47,264.21559029750824C47,262.9622902975082,47.786568,261.79479029750826,49.14909,260.99639029750824L105.2834,228.42687029750823C107.78059999999999,226.97609529750824,111.7006,226.97609529750824,114.2107,228.42687029750823L170.697,260.99639029750824C172.09,261.79909029750826,172.885,262.97509029750825,172.889,264.23279029750825C172.894,265.49039029750827,172.103,266.65359029750823,170.74,267.45189029750827L114.6061,300.01719029750825C113.2388,300.7564902975082,111.7035,301.13049029750823,110.1489,301.10309029750823ZM109.7535,229.60294029750824C108.5935,229.57820029750823,107.4461,229.84694029750824,106.41810000000001,230.38414029750825L50.29241,262.93649029750827C49.63049,263.3227902975082,49.24795,263.79489029750823,49.24795,264.22419029750824C49.24795,264.6533902975082,49.63908,265.12979029750824,50.3139,265.51179029750824L106.8006,298.0813902975082C108.6188,299.12869029750823,111.6748,299.12869029750823,113.4757,298.0813902975082L169.59699999999998,265.51609029750824C170.25900000000001,265.12979029750824,170.642,264.6576902975082,170.642,264.22849029750824C170.642,263.79919029750823,170.25,263.3227902975082,169.571,262.9407902975082L113.0889,230.37126029750823C112.0597,229.83853029750824,110.9123,229.57423029750825,109.7535,229.60294029750824Z" fill="url(#master_svg5_3_5535)" fill-opacity="1"/></g></g></g><g><g style="opacity:0.10000000149011612;"><path d="M334.5486047363281,239.90428571987152C341.4256047363281,243.85748571987153,341.4256047363281,250.27008571987153,334.6306047363281,254.22318571987154L260.61960473632814,297.2057857198715C253.80710473632814,301.1587857198715,242.7264047363281,301.1587857198715,235.86650473632812,297.2057857198715L161.33167473632813,254.2403857198715C154.45458473632812,250.28718571987153,154.45458473632812,243.8788857198715,161.25000473632812,239.92148571987153L235.28190473632813,196.9818757198715C242.09880473632813,193.0244277198715,253.17960473632814,193.0244277198715,260.0396047363281,196.9818757198715L334.5486047363281,239.90428571987152Z" fill="#0246AF" fill-opacity="1"/></g><g><path d="M339.546828125,222.4950107931137L339.546828125,222.6838107931137C339.50882812500004,225.2334107931137,337.827828125,227.7701107931137,334.475828125,229.7059107931137L260.51182812499997,272.6286107931137C253.699628125,276.5816107931137,242.623228125,276.5726107931137,235.771928125,272.6286107931137L161.331648125,229.7059107931137C157.893098125,227.7229107931137,156.173828125,225.1175107931137,156.173828125,222.51641079311372C156.174359364,222.0109107931137,156.239354125,221.5075107931137,156.367245125,221.0184107931137C156.895920125,218.96241079311372,158.516348125,216.98371079311372,161.25857812499999,215.39991079311372L235.221728125,172.4774807931137C242.034328125,168.5286097931137,253.10212812499998,168.5200297931137,259.961828125,172.4774807931137L334.41082812499997,215.39991079311372C337.182828125,217.00091079311372,338.837828125,219.0011107931137,339.374828125,221.0785107931137C339.491828125,221.5416107931137,339.549828125,222.0175107931137,339.546828125,222.4950107931137Z" fill="url(#master_svg6_3_5433)" fill-opacity="1"/></g><g><path d="M334.475828125,229.70592549037934L260.51182812499997,272.6283254903793C253.699628125,276.58152549037936,242.623228125,276.57292549037936,235.771928125,272.6283254903793L161.331648125,229.70592549037934C157.893098125,227.72291549037934,156.173828125,225.11752549037934,156.173828125,222.51642549037933L156.173828125,225.23770549037934C156.173828125,227.84738549037934,157.893098125,230.40984549037933,161.331648125,232.39715549037933L235.784828125,275.31962549037934C236.214628125,275.5556254903793,236.644428125,275.77452549037935,237.074228125,275.9848254903793C237.22032812499998,276.05782549037934,237.375128125,276.1179254903793,237.525528125,276.18662549037936C237.783428125,276.2982254903793,238.041328125,276.41832549037935,238.31642812500002,276.52572549037933C238.355128125,276.52572549037933,238.410928125,276.5600254903793,238.458228125,276.58152549037936L238.75912812500002,276.6888254903793C239.102928125,276.81752549037935,239.459728125,276.9377254903793,239.82072812500002,277.0493254903793C239.941128125,277.09222549037935,240.06142812500002,277.13092549037935,240.19042812499998,277.1652254903793L240.439728125,277.24682549037936C240.585828125,277.28542549037934,240.740628125,277.31122549037934,240.869528125,277.3541254903793C241.230528125,277.4442254903793,241.595928125,277.53862549037933,241.956928125,277.6202254903793L242.253528125,277.68892549037935C242.395328125,277.7232254903793,242.541528125,277.7361254903793,242.683328125,277.76612549037935L243.607428125,277.92922549037934C243.736428125,277.92922549037934,243.85672812500002,277.9764254903793,243.98572812499998,277.9893254903793C244.114628125,278.0022254903793,244.260828125,278.0151254903793,244.394028125,278.03652549037935C244.686328125,278.07522549037935,244.974328125,278.1052254903793,245.253628125,278.13522549037936L245.683528125,278.18252549037936C245.812428125,278.18252549037936,245.94572812500002,278.18252549037936,246.074628125,278.18252549037936C246.37122812500002,278.18252549037936,246.663428125,278.21682549037934,246.960028125,278.22972549037934C247.110528125,278.22972549037934,247.25662812500002,278.22972549037934,247.411328125,278.22972549037934L247.725128125,278.22972549037934C248.04752812499999,278.22972549037934,248.365528125,278.22972549037934,248.68792812499998,278.22972549037934C248.846928125,278.22972549037934,249.010328125,278.22972549037934,249.165028125,278.22972549037934C249.31972812499998,278.22972549037934,249.349828125,278.22972549037934,249.444428125,278.22972549037934C249.839828125,278.22972549037934,250.230928125,278.18672549037933,250.62642812500002,278.15672549037936C250.789728125,278.15672549037936,250.948728125,278.15672549037936,251.103528125,278.1224254903793L251.327028125,278.0966254903793L251.68372812500002,278.05802549037935C252.092128125,278.0022254903793,252.49612812499998,277.95072549037934,252.89152812499998,277.8820254903793C252.990428125,277.8820254903793,253.093528125,277.8562254903793,253.192428125,277.83482549037933L253.33422812499998,277.83482549037933C253.523328125,277.79192549037936,253.712528125,277.74462549037935,253.897328125,277.7103254903793L254.86442812500002,277.50432549037936C255.09652812500002,277.4485254903793,255.324328125,277.38412549037935,255.552128125,277.3154254903793C255.85302812499998,277.2339254903793,256.153828125,277.1566254903793,256.450828125,277.0622254903793L256.643828125,277.00642549037934C257.000828125,276.89482549037933,257.35782812499997,276.7660254903793,257.705828125,276.63302549037934C257.753828125,276.60962549037936,257.804828125,276.58952549037934,257.855828125,276.57292549037936C258.238828125,276.42262549037935,258.60782812499997,276.2638254903793,258.977828125,276.0964254903793L259.329828125,275.95912549037934C259.733828125,275.77292549037935,260.128828125,275.56662549037935,260.51182812499997,275.3410254903793L334.47982812500004,232.41862549037933L334.69482812499996,232.29844549037932C335.00882812500004,232.10958549037935,335.304828125,231.90785549037935,335.58882812499996,231.71470549037934L335.725828125,231.61169549037933C336.048828125,231.37991549037935,336.353828125,231.14384549037933,336.62882812500004,230.90348549037932C336.669828125,230.86497549037932,336.712828125,230.82913549037934,336.757828125,230.79617549037934C336.800828125,230.74896549037933,336.86482812500003,230.70174549037932,336.90782812500004,230.65882549037934C337.13182812499997,230.45278549037934,337.337828125,230.22959549037932,337.539828125,230.02356549037933L337.65582812499997,229.89050549037933C337.767828125,229.75315549037933,337.892828125,229.62868549037933,337.990828125,229.49132549037932C338.089828125,229.35397549037933,338.154828125,229.27671549037933,338.227828125,229.16941549037932C338.25382812500004,229.13078549037934,338.28782812500003,229.09643549037932,338.313828125,229.05780549037934C338.452828125,228.86216549037934,338.58082812500004,228.65866549037932,338.695828125,228.44830549037934C338.738828125,228.37962549037934,338.768828125,228.31095549037934,338.803828125,228.24656549037934C338.837828125,228.18218549037934,338.850828125,228.15643549037932,338.872828125,228.11780549037934C338.97982812500004,227.89889549037935,339.078828125,227.68858549037932,339.168828125,227.45251549037934C339.168828125,227.40101549037934,339.198828125,227.34520549037933,339.220828125,227.29370549037932L339.25882812500004,227.17352549037935C339.334828125,226.94397549037933,339.398828125,226.71041549037935,339.448828125,226.47388549037933L339.448828125,226.33224549037934C339.448828125,226.29361549037932,339.448828125,226.25498549037934,339.469828125,226.20776549037933C339.50882812500004,225.96339549037933,339.533828125,225.71684549037934,339.542828125,225.46950549037933L339.542828125,222.70529849037933C339.50882812500004,225.23342549037935,337.81482812499996,227.77013549037935,334.475828125,229.70592549037934Z" fill="url(#master_svg7_3_5437)" fill-opacity="1"/></g></g><g><g><g><path d="M205.50839658203125,21.67789491316986C208.25069658203125,20.098349913169862,210.48569658203127,21.36456091316986,210.49429658203127,24.51506791316986L210.78659658203125,127.12519791316986C210.78659658203125,130.27119791316986,208.57299658203124,134.10919791316985,205.83509658203127,135.68819791316986L116.43286658203125,187.24219791316986C113.68632658203126,188.82619791316986,111.45557258203125,187.55619791316985,111.44697458203125,184.40519791316987L111.15899658203125,81.82079791316986C111.15899658203125,78.67029791316986,113.36396658203125,74.83729791316986,116.10620658203125,73.23629791316986L205.50839658203125,21.67789491316986Z" fill="#2564F4" fill-opacity="1"/></g></g><g><g><path d="M216.59781010742188,28.146580063316346C219.34001010742188,26.567035063316347,221.5708101074219,27.833247063316346,221.5837101074219,30.983753063316346L221.87171010742188,133.59388306331635C221.87171010742188,136.74488306331637,219.66241010742186,140.57788306331634,216.9202101074219,142.15688306331634L127.51798010742188,193.71088306331634C124.77573010742188,195.29488306331635,122.54497510742188,194.02488306331634,122.53638310742187,190.87388306331636L122.24411010742188,88.28948306331634C122.24411010742188,85.13898306331635,124.44908010742188,81.30598306331635,127.19562010742187,79.72648306331635L216.59781010742188,28.146580063316346Z" fill="#2564F4" fill-opacity="1"/></g></g><g><g><path d="M227.68702192382813,34.61928116121673C230.42502192382813,33.018275161216735,232.68152192382814,34.305947161216736,232.68152192382814,37.452162161216734L232.97382192382813,140.06205216121674C232.97382192382813,143.21305216121675,230.7645219238281,147.04605216121672,228.02232192382814,148.62505216121673L138.6200919238281,200.18005216121674C135.87355192382813,201.76305216121673,133.6470869238281,200.49305216121672,133.63849492382812,197.34205216121674L133.34622192382812,94.75785216121673C133.34622192382812,91.60735216121674,135.55119192382813,87.77445216121674,138.29773192382814,86.19485216121674L227.68702192382813,34.61928116121673Z" fill="#2564F4" fill-opacity="1"/></g></g><g><g><path d="M212.57027546386718,92.02372632820892C219.2238754638672,88.18645832820893,230.3776754638672,105.52709832820892,237.0312754638672,101.68989832820893L237.0613754638672,112.89259832820892L159.4404754638672,157.64779832820892L159.4404754638672,150.99479832820893C166.0897654638672,147.15759832820893,166.0553854638672,133.98039832820893,172.70897546386718,130.1430983282089C179.3625754638672,126.30589832820893,179.3711754638672,129.8640983282089,186.03337546386717,126.02689832820892C192.69547546386718,122.18959832820892,192.65257546386718,110.18419832820892,199.3061754638672,106.34689832820892C205.9596754638672,102.50969832820893,205.9167754638672,95.86098832820892,212.57027546386718,92.02372632820892Z" fill="#97B2F8" fill-opacity="1"/></g></g><g><path d="M159.50926533007814,151.14503172664644L159.33303833007812,150.8403317266464C162.6082483300781,148.95603172664642,164.27594833007814,144.65943172664643,165.89206833007813,140.50463172664644C167.50818833007813,136.34973172664644,169.22316833007812,131.94153172664642,172.6015383300781,129.99293172664642C175.9799383300781,128.04423172664642,177.68193833007814,127.97983172664642,179.34103833007813,127.91113172664643C181.00013833007813,127.84243172664642,182.62913833007812,127.77383172664642,185.9173383300781,125.87663172664642C189.20543833007812,123.97943172664642,190.86883833007812,119.98763172664643,192.48493833007814,116.11603172664643C194.10103833007813,112.24443172664643,195.81603833007813,108.14533172664642,199.19433833007812,106.19673172664642C202.48243833007814,104.29953172664642,204.1587383300781,101.65553172664642,205.77493833007813,99.09304172664642C207.39103833007812,96.53057172664643,209.11883833007812,93.81358172664642,212.48433833007812,91.86919472664643C215.84983833007811,89.92481172664642,220.4832383300781,93.36289172664642,224.90613833007814,96.71943172664642C229.23863833007812,100.00299172664643,233.71733833007812,103.40243172664643,236.94103833007813,101.53963172664642L237.11293833007812,101.84433172664643C233.67433833007811,103.81883172664642,229.11403833007813,100.35067172664642,224.69123833007814,96.99413172664643C220.35863833007812,93.71057172664642,215.87993833007812,90.31540572664642,212.6562383300781,92.17394672664642C209.36383833007812,94.07112172664642,207.68753833007813,96.71943172664642,206.06713833007814,99.28190172664642C204.44673833007812,101.84433172664643,202.72753833007812,104.56133172664643,199.36203833007812,106.50143172664642C196.09103833007813,108.38573172664643,194.4191383300781,112.38613172664643,192.80293833007812,116.25343172664643C191.18683833007813,120.12073172664643,189.47193833007813,124.22843172664642,186.09353833007813,126.15993172664642C182.71513833007813,128.09143172664642,181.01303833007813,128.17293172664642,179.35393833007814,128.24593172664643C177.6948383300781,128.31893172664644,176.06583833007812,128.38333172664642,172.77773833007814,130.28043172664644C169.48963833007812,132.17763172664644,167.83484833007813,136.46133172664642,166.21872833007814,140.61623172664642C164.60259833007814,144.7710317266464,162.88762833007812,149.1963317266464,159.50926533007814,151.14503172664644Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M159.32025926953125,114.7425584795761L159.44060726953126,157.6263284795761L236.85952626953124,112.98702847957611L236.85952626953124,113.45917747957611L159.03227526953125,158.3259284795761L158.91192626953125,114.9743384795761L159.32025926953125,114.7425584795761Z" fill="#FFFFFF" fill-opacity="1"/></g><g><g><path d="M211.10046142578125,98.38052250301361C214.33266142578125,96.5176925030136,214.35416142578126,104.19220250301362,217.59066142578126,102.32510250301361C220.82726142578124,100.45797250301361,220.85296142578125,109.07250250301361,224.08526142578125,107.20540250301362C227.31746142578123,105.3382025030136,227.33896142578124,111.84530250301361,230.57546142578127,109.97820250301362C233.81206142578125,108.11100250301361,233.76906142578125,94.06253250301361,237.02276142578125,92.19540250301361L237.08296142578126,112.90120250301361L159.44055182578126,157.65640250301362L159.41046142578125,147.6855025030136C162.64699142578124,145.8227025030136,162.64699142578124,146.01580250301362,165.87922142578125,144.15300250301362C169.11145142578124,142.2901025030136,169.10286142578124,139.70190250301363,172.32646142578125,137.8391025030136C175.55016142578125,135.9763025030136,175.52436142578125,123.24550250301361,178.77376142578126,121.36120250301362C182.02316142578124,119.4769025030136,182.01026142578124,119.36960250301361,185.24256142578125,117.49820250301362C188.47476142578125,115.6267025030136,188.46616142578125,112.00410250301361,191.68976142578126,110.1370025030136C194.91346142578124,108.26980250301361,194.96936142578124,124.81640250301362,198.20156142578125,122.95360250301361C201.43376142578126,121.0908025030136,201.43376142578126,119.66150250301361,204.64886142578126,117.80290250301361C207.86386142578124,115.9444025030136,207.86816142578124,100.24765250301361,211.10046142578125,98.38052250301361Z" fill="#0246AF" fill-opacity="1"/></g></g><g><path d="M159.5005373027344,147.83572130184174L159.32431030273438,147.53532130184175C160.94472030273437,146.59962130184175,161.76568030273438,146.17462130184174,162.56514030273436,145.76262130184173C163.36461030273438,145.35052130184175,164.1769603027344,144.92992130184174,165.78878030273438,143.99842130184174C167.40060030273438,143.06702130184175,168.14848030273438,142.01972130184174,168.96515030273437,140.89522130184173C169.78181030273439,139.77062130184174,170.60271030273438,138.63742130184173,172.25321030273437,137.68462130184173C173.80061030273438,136.79182130184174,174.60431030273438,133.11762130184172,175.38231030273437,129.56362130184175C176.21621030273437,125.76932130184173,176.99841030273438,122.18102130184174,178.68331030273438,121.21092130184174C180.29941030273437,120.27952130184174,181.12041030273437,119.77302130184174,181.9155103027344,119.28372130184174C182.71071030273438,118.79442130184174,183.53601030273438,118.28792130184173,185.15211030273437,117.35652130184174C186.76821030273436,116.42512130184173,187.49891030273437,115.13312130184174,188.31551030273437,113.74242130184174C189.13221030273436,112.35172130184174,189.9488103027344,110.95252130184173,191.60791030273438,109.99532130184173C191.8967103027344,109.80532130184173,192.26171030273437,109.77302130184174,192.57931030273437,109.90952130184174C193.7656103027344,110.42882130184174,194.42331030273436,113.38622130184174,195.12391030273437,116.51522130184173C195.77291030273437,119.42112130184174,196.44771030273438,122.42992130184174,197.47071030273437,122.88062130184173C197.68701030273436,122.96692130184174,197.93211030273437,122.93962130184174,198.12401030273438,122.80762130184173C199.31481030273437,122.12692130184173,200.39341030273437,121.26692130184173,201.32181030273438,120.25812130184174C202.27021030273437,119.22712130184173,203.37201030273437,118.34832130184174,204.5885103027344,117.65272130184174C206.13581030273437,116.75992130184173,206.93961030273437,112.33892130184174,207.71751030273438,108.05952130184174C208.54281030273438,103.50542130184174,209.32511030273437,99.20462130184174,211.01431030273437,98.23029130184173C211.43591030273438,97.94443130184173,211.95871030273437,97.84936130184174,212.45421030273437,97.96846130184174C213.34391030273437,98.20883130184174,213.9284103027344,99.25613130184173,214.49581030273438,100.26910130184174C215.02881030273437,101.21769130184174,215.57891030273439,102.19632130184173,216.32681030273437,102.41522130184174C216.73461030273438,102.50392130184173,217.16091030273438,102.42002130184173,217.5045103027344,102.18342130184173C217.90811030273437,101.91559130184174,218.40771030273436,101.83426130184174,218.87561030273437,101.96025130184174C219.8084103027344,102.24352130184174,220.41441030273438,103.49692130184174,220.99891030273437,104.70302130184173C221.5491103027344,105.84472130184173,222.11651030273438,107.02082130184174,222.90731030273437,107.27832130184174C223.28141030273437,107.37002130184173,223.67691030273437,107.29822130184174,223.99481030273438,107.08092130184174C225.7570103027344,106.06792130184174,226.6682103027344,107.36842130184174,227.47201030273436,108.51882130184174C228.27581030273439,109.66912130184173,229.00651030273437,110.70782130184173,230.4807103027344,109.85372130184174C232.02811030273438,108.96092130184174,232.83181030273437,104.95622130184174,233.6098103027344,101.08463130184174C234.43941030273436,96.94691130184174,235.22161030273438,93.04096530184174,236.91081030273438,92.07092130184174L237.08271030273437,92.37137730184173C235.53541030273436,93.26416130184174,234.7273103027344,97.27741130184174,233.94941030273438,101.15330130184174C233.11981030273438,105.28242130184174,232.33751030273436,109.18412130184174,230.6526103027344,110.16702130184174C228.89471030273438,111.18002130184173,227.98351030273437,109.87512130184174,227.17541030273438,108.72912130184173C226.36731030273438,107.58312130184174,225.64101030273437,106.54002130184173,224.16671030273437,107.39422130184174C223.76211030273436,107.65942130184173,223.26431030273437,107.74192130184173,222.79561030273436,107.62172130184173C221.86291030273438,107.33412130184173,221.26111030273438,106.08512130184174,220.6766103027344,104.87472130184173C220.12641030273437,103.73722130184174,219.55471030273438,102.55682130184174,218.76821030273436,102.29932130184173C218.39131030273438,102.20792130184174,217.99331030273436,102.27962130184173,217.67211030273438,102.49682130184173C217.2486103027344,102.78182130184173,216.7255103027344,102.87822130184173,216.2280103027344,102.76292130184174C215.33821030273438,102.51822130184173,214.75371030273436,101.47522130184174,214.18631030273437,100.45796130184173C213.65331030273438,99.50938130184174,213.10321030273437,98.53074130184173,212.35531030273438,98.31184130184174C211.94891030273436,98.22589130184174,211.52491030273438,98.30963130184173,211.18191030273437,98.54362130184174C209.63881030273438,99.43212130184173,208.8351103027344,103.85312130184174,208.05711030273437,108.13252130184173C207.22761030273438,112.68652130184174,206.44531030273438,116.99172130184174,204.75611030273438,117.96602130184174C203.56681030273438,118.64342130184174,202.49071030273439,119.50212130184174,201.56681030273438,120.51132130184173C200.61731030273438,121.54152130184174,199.51391030273436,122.41892130184173,198.29591030273437,123.11242130184174C198.0088103027344,123.30252130184174,197.64501030273436,123.33482130184174,197.32881030273438,123.19822130184174C196.14251030273437,122.67892130184174,195.48061030273436,119.72152130184173,194.78431030273438,116.59252130184174C194.13531030273438,113.68662130184174,193.46051030273438,110.67782130184173,192.43751030273438,110.22712130184173C192.2212103027344,110.14082130184174,191.97601030273438,110.16812130184174,191.78421030273438,110.30012130184173C190.20681030273437,111.21002130184173,189.43311030273438,112.52342130184174,188.61641030273438,113.91842130184173C187.7998103027344,115.31342130184174,186.98311030273436,116.70412130184174,185.32401030273437,117.65702130184174C183.66491030273437,118.60982130184173,182.89551030273438,119.09062130184174,182.10041030273436,119.57992130184174C181.30521030273437,120.06922130184174,180.48001030273437,120.58002130184174,178.85531030273438,121.51572130184174C177.30791030273437,122.40852130184173,176.50421030273438,126.08262130184173,175.7262103027344,129.63662130184173C174.8966103027344,133.43522130184175,174.11011030273437,137.01932130184173,172.42951030273437,137.98932130184173C170.84341030273438,138.90352130184175,170.06981030273437,139.96802130184173,169.24883030273438,141.09692130184175C168.42787030273436,142.22572130184173,167.61552030273438,143.35032130184175,165.96501030273438,144.30322130184175C164.31449030273438,145.25612130184174,163.51934030273438,145.66382130184172,162.72417030273436,146.07592130184173C161.92901030273438,146.48792130184174,161.11236030273437,146.90862130184172,159.5005373027344,147.83572130184174Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M194.35450180664063,147.02877931551362C195.68270180664064,146.2647603155136,196.76580180664064,146.8785483155136,196.77010180664064,148.40230531551362C196.6810018066406,150.0880053155136,195.78950180664063,151.6293253155136,194.37170180664063,152.5486053155136L161.56368180664063,171.4644853155136C160.2355418066406,172.2327853155136,159.15240418664064,171.61478531551361,159.14810180664062,170.09098531551362C159.23717940664062,168.4052853155136,160.12874280664062,166.86398531551362,161.54648180664063,165.9446853155136L194.35450180664063,147.02877931551362Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M214.62931259765625,63.922419465904234C215.96171259765626,63.15410746590423,217.03631259765626,63.772191465904235,217.04061259765626,65.29593946590424C216.95221259765626,66.98183946590423,216.06051259765624,68.52345946590424,214.64221259765625,69.44223946590424L181.83418259765625,88.35813946590423C180.50605259765624,89.12213946590424,179.42720185765626,88.50833946590424,179.42291259765625,86.98463946590424C179.51200339765626,85.29893946590424,180.40355359765624,83.75763946590423,181.82129259765625,82.83833946590424L214.62931259765625,63.922419465904234Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M184.112094140625,165.28369264559174C185.440194140625,164.51967364559172,186.519094140625,165.13346164559172,186.523394140625,166.65721864559174C186.434294140625,168.34291864559174,185.542694140625,169.88423864559172,184.124994140625,170.80351864559174L161.697074140625,183.73599864559174C160.368934140625,184.50009864559172,159.285796520625,183.88629864559175,159.281494140625,182.36249864559173C159.370584940625,180.67679864559173,160.262135140625,179.13549864559172,161.679874140625,178.21619864559173L184.112094140625,165.28369264559174Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M147.5516879296875,207.64332073116302C147.0364379296875,207.64932073116302,146.5291179296875,207.517320731163,146.0817079296875,207.26132073116304C145.0329549296875,206.66132073116302,144.4527039296875,205.42032073116303,144.4484009296875,203.77232073116303L144.1561279296875,101.18762073116302C144.1561279296875,97.93412073116303,146.4470579296875,93.95522073116302,149.28385792968749,92.31982073116302L238.6989279296875,40.74430373116302C240.1431279296875,39.91160873116303,241.51852792968748,39.787133731163024,242.5673279296875,40.39233973116303C243.61612792968748,40.99754573116302,244.19612792968752,42.23371073116302,244.20112792968752,43.881930731163024L243.51292792968752,43.881930731163024C243.51292792968752,42.495540731163025,243.05302792968752,41.46969073116303,242.22352792968752,40.99754573116302C241.3939279296875,40.525397731163025,240.26782792968748,40.64558173116303,239.05142792968752,41.34951073116302L149.6492079296875,92.90362073116302C147.0058279296875,94.42732073116302,144.8610299296875,98.13152073116302,144.8696279296875,101.16192073116302L145.1618979296875,203.77232073116303C145.1618979296875,205.15832073116303,145.6218079296875,206.184320731163,146.4513579296875,206.65632073116302C147.2808979296875,207.12832073116303,148.4070279296875,207.00832073116302,149.6277179296875,206.30432073116302L149.9801679296875,206.910320731163C149.2491679296875,207.36332073116301,148.4116379296875,207.61632073116303,147.5516879296875,207.64332073116302Z" fill="#97B2F8" fill-opacity="1"/></g></g><g><g><path d="M311.3597729003906,61.3942788778305C313.43147290039065,62.58322887783051,313.44437290039065,64.51902887783051,311.3854729003906,65.71652887783051L296.4922729003906,74.35682887783051C294.4334729003906,75.5501288778305,291.0894729003906,75.5501288778305,289.02207290039064,74.35682887783051L274.02569290039065,65.71222887783051C271.95396290039065,64.51902887783051,271.9453589003906,62.58322887783051,274.0042029003906,61.389988877830504L288.8973729003906,52.762579877830504C290.9519729003906,51.565043877830504,294.2959729003906,51.565043877830504,296.36767290039063,52.762579877830504L311.3597729003906,61.3942788778305Z" fill="#2564F4" fill-opacity="1"/></g><g><g><path d="M311.5272781738281,160.58798978359223C313.5947781738281,161.77696978359222,313.6076781738281,163.71276978359222,311.5530781738281,164.9059697835922L296.65987817382813,173.5505697835922C294.6010781738281,174.74376978359223,291.2527781738281,174.74376978359223,289.1853781738281,173.5505697835922L274.1932781738281,164.9059697835922C272.1215461738281,163.71276978359222,272.1086651738281,161.77696978359222,274.16748817382813,160.58367978359223L289.06067817382814,151.93909878359221C291.1194781738281,150.74585578359222,294.46347817382815,150.74585578359222,296.53097817382815,151.93909878359221L311.5272781738281,160.58798978359223Z" fill="#0246AF" fill-opacity="1"/></g></g><g><path d="M312.9071229980469,63.724963772361754C312.9071229980469,63.77647177236175,312.9071229980469,63.832269772361755,312.9071229980469,63.88806777236176C312.9071229980469,63.943865772361754,312.88562299804687,63.97820477236176,312.87272299804687,64.02541977236176C312.8609229980469,64.07805377236176,312.84512299804686,64.12971277236176,312.8255229980469,64.17994077236176C312.81092299804686,64.22525577236175,312.7936229980469,64.26968377236176,312.7739229980469,64.31299877236175C312.7481229980469,64.36450677236175,312.7266229980469,64.42030477236176,312.6965229980469,64.47610277236176C312.66642299804687,64.53190077236175,312.64922299804687,64.55336077236176,312.6235229980469,64.59199077236175C312.5977229980469,64.63062077236175,312.5461229980469,64.71647077236176,312.4988229980469,64.77656077236176C312.45152299804687,64.83665077236175,312.44292299804687,64.84524077236176,312.41712299804686,64.88386077236176C312.3914229980469,64.92249077236175,312.2710229980469,65.04268077236175,312.19362299804686,65.12423077236176L312.1034229980469,65.21007077236176L311.94432299804686,65.34313077236176L311.79392299804687,65.45902077236175L311.60482299804687,65.58349077236176C311.53602299804686,65.62642077236175,311.47582299804685,65.67363077236176,311.4028229980469,65.71655077236176L296.5096229980469,74.35682077236176C296.34832299804685,74.45062077236176,296.18182299804687,74.53512077236175,296.0110229980469,74.61012077236175L295.8606229980469,74.67442077236176C295.7273229980469,74.73022077236176,295.5855229980469,74.78172077236175,295.43072299804686,74.82902077236176L295.27602299804687,74.88482077236175L295.00522299804686,74.96202077236175L294.79462299804686,75.01782077236176L294.50662299804685,75.07792077236175L294.30462299804685,75.12082077236175C294.10692299804685,75.15522077236176,293.90492299804686,75.18092077236176,293.70292299804686,75.20242077236176L293.51812299804686,75.20242077236176L293.1613229980469,75.22382077236176L292.9292229980469,75.22382077236176L292.64132299804686,75.22382077236176L292.40062299804686,75.22382077236176C292.3103229980469,75.22382077236176,292.2200229980469,75.22382077236176,292.12982299804685,75.22382077236176L291.8891229980469,75.22382077236176L291.6226229980469,75.19382077236176L291.3862229980469,75.16382077236176L291.1068229980469,75.11222077236175L290.8876229980469,75.06932077236175L290.56092299804686,74.98782077236176L290.38042299804687,74.94062077236175C290.1879229980469,74.88652077236176,289.9985229980469,74.82212077236176,289.8130229980469,74.74742077236175L289.73572299804687,74.71742077236175C289.48982299804686,74.62032077236175,289.25142299804685,74.50552077236176,289.02222299804686,74.37402077236176L274.02584299804687,65.72943077236175C272.9856889980469,65.12851077236175,272.46559899804686,64.33874177236176,272.46559899804686,63.55326067236175L272.2248229980469,149.55692077236176C272.2248229980469,150.34242077236175,272.74491299804686,151.13212077236176,273.7850629980469,151.73312077236176L288.7814229980469,160.37762077236175C289.0126229980469,160.50832077236174,289.2524229980469,160.62302077236177,289.4992229980469,160.72102077236175L289.5422229980469,160.74252077236176L289.5723229980469,160.74252077236176Q289.84742299804685,160.85412077236174,290.1396229980469,160.93562077236174L290.1826229980469,160.93562077236174L290.3201229980469,160.97002077236175L290.6468229980469,161.05152077236176L290.73712299804686,161.07302077236176L290.8660229980469,161.09442077236176L291.14972299804685,161.14162077236176L291.2614229980469,161.16312077236176L291.38182299804686,161.16312077236176L291.64832299804686,161.19312077236174C291.68982299804685,161.19522077236175,291.73142299804687,161.19522077236175,291.77292299804685,161.19312077236174L291.88902299804687,161.19312077236174L292.1598229980469,161.19312077236174L292.29302299804687,161.19312077236174L292.9206229980469,161.19312077236174C293.0409229980469,161.19312077236174,293.1570229980469,161.19312077236174,293.2773229980469,161.16742077236177L293.42352299804685,161.16742077236177L293.4664229980469,161.16742077236177C293.6684229980469,161.14592077236176,293.86622299804685,161.11592077236176,294.06392299804685,161.08152077236176L294.09402299804685,161.08152077236176L294.2659229980469,161.04722077236175L294.55822299804686,160.98282077236178L294.76452299804686,160.92702077236174L295.03532299804687,160.84982077236174L295.0955229980469,160.84982077236174L295.19002299804686,160.81542077236176Q295.40492299804686,160.74252077236176,295.61982299804686,160.66092077236175L295.7703229980469,160.59652077236177C295.9422229980469,160.51932077236177,296.10982299804687,160.43342077236176,296.26882299804686,160.34332077236175L311.16212299804687,151.69872077236175L311.2265229980469,151.66012077236175C311.27402299804686,151.63262077236175,311.3199229980469,151.60252077236174,311.36412299804687,151.57002077236177L311.55322299804686,151.44552077236176L311.70362299804685,151.32962077236175C311.75522299804686,151.28242077236177,311.81542299804687,151.23952077236174,311.8627229980469,151.19222077236174L311.8971229980469,151.16652077236176L311.95292299804686,151.11072077236176C312.0320229980469,151.03342077236175,312.1066229980469,150.95172077236174,312.17642299804686,150.86602077236176L312.22372299804687,150.81452077236176L312.2624229980469,150.76302077236176L312.3871229980469,150.57852077236174C312.4027229980469,150.55172077236176,312.4200229980469,150.52592077236176,312.43862299804687,150.50122077236176C312.43702299804687,150.48842077236174,312.43702299804687,150.47542077236176,312.43862299804687,150.46262077236176C312.46872299804687,150.40682077236175,312.4902229980469,150.35102077236175,312.5160229980469,150.29522077236174C312.5321229980469,150.26452077236175,312.54642299804686,150.23302077236175,312.5590229980469,150.20072077236176L312.5590229980469,150.16642077236176C312.5590229980469,150.11492077236176,312.5891229980469,150.06342077236175,312.60192299804686,150.01192077236175C312.61482299804686,149.96042077236177,312.62772299804686,149.93892077236177,312.63202299804686,149.90462077236174C312.6341229980469,149.89472077236175,312.6341229980469,149.88442077236175,312.63202299804686,149.87452077236173C312.63202299804686,149.81872077236176,312.63202299804686,149.76292077236175,312.63202299804686,149.70712077236175C312.6344229980469,149.67142077236176,312.6344229980469,149.63552077236176,312.63202299804686,149.59982077236174L312.63202299804686,149.55262077236176L312.87702299804687,63.536120772361755C312.9200229980469,63.621951172361754,312.9114229980469,63.673455772361756,312.9071229980469,63.724963772361754Z" fill="url(#master_svg8_3_5449)" fill-opacity="1"/></g><g><path d="M344.9801737304688,102.307926762352C347.04757373046874,103.50121676235199,347.06477373046874,105.43691676235198,345.0059737304688,106.63021676235199L330.10847373046875,115.27481676235199C328.0539737304687,116.468016762352,324.70567373046873,116.468016762352,322.63827373046877,115.27481676235199L307.64186373046874,106.63021676235199C305.57443773046873,105.43701676235199,305.56583273046874,103.50121676235199,307.64186373046874,102.307926762352L322.51357373046875,93.663351762352C324.57237373046877,92.470109762352,327.92067373046876,92.470109762352,329.9880737304687,93.663351762352L344.9801737304688,102.307926762352Z" fill="#2564F4" fill-opacity="1"/></g><g><g><path d="M344.9802042480469,179.89876060146332C347.04760424804687,181.08767060146332,347.06480424804687,183.02347060146332,345.0060042480469,184.2167706014633L330.10850424804687,192.8656706014633C328.05400424804685,194.05457060146333,324.70570424804686,194.05457060146333,322.6383042480469,192.8656706014633L307.64189424804687,184.2167706014633C305.57446824804686,183.02777060146332,305.56586324804687,181.08767060146332,307.64189424804687,179.89876060146332L322.5136042480469,171.2498886014633C324.5724042480469,170.05664560146332,327.9207042480469,170.06094160146333,329.98810424804685,171.2498886014633L344.9802042480469,179.89876060146332Z" fill="#0246AF" fill-opacity="1"/></g></g><g><path d="M346.52746201171874,104.63860230190276C346.52746201171874,104.69440330190277,346.52746201171874,104.75019830190277,346.52746201171874,104.80599930190277C346.52746201171874,104.86180030190278,346.50596201171874,104.89613930190276,346.49306201171873,104.93905730190276C346.48186201171876,104.99324730190277,346.46606201171875,105.04637630190277,346.44586201171876,105.09786830190276C346.44586201171876,105.14079330190278,346.41146201171875,105.18371230190277,346.39426201171875,105.22663730190277L346.31686201171874,105.38974430190277L346.24386201171876,105.50992230190278C346.20516201171876,105.57002230190277,346.16646201171875,105.63011230190277,346.11916201171874,105.69020230190277C346.0929620117187,105.72782230190278,346.06416201171874,105.76367230190277,346.03316201171873,105.79750230190277C345.96446201171875,105.88280230190277,345.88976201171874,105.96313230190277,345.80966201171873,106.03787230190277C345.78326201171876,106.06859230190277,345.7544620117188,106.09728230190277,345.72376201171875,106.12371230190277C345.67216201171874,106.17093230190277,345.61626201171873,106.21385230190278,345.5603620117188,106.25677230190277L345.41426201171873,106.37695230190278L345.22516201171874,106.50142230190278L345.02316201171874,106.63019230190277L330.12566201171876,115.27473230190277C329.9643620117188,115.36853230190277,329.79786201171873,115.45313230190277,329.62706201171875,115.52803230190277L329.47666201171876,115.59243230190278Q329.27886201171873,115.67393230190277,329.0467620117187,115.74693230190277C328.99526201171875,115.74693230190277,328.94796201171874,115.78553230190278,328.89206201171874,115.79843230190278C328.80316201171877,115.82873230190278,328.7127620117187,115.85443230190278,328.6212620117187,115.87563230190277L328.4149620117187,115.93143230190277L328.1226620117188,115.99583230190277L327.9249620117188,116.03453230190277C327.7272620117187,116.06883230190277,327.5252620117187,116.09883230190277,327.3232620117187,116.12033230190278L327.13406201171875,116.12033230190278C327.01376201171877,116.12033230190278,326.89766201171875,116.14183230190277,326.77736201171876,116.14603230190278L326.25726201171875,116.14603230190278L326.01656201171875,116.14603230190278L325.74576201171874,116.14603230190278L325.50076201171873,116.14603230190278L325.2385620117187,116.11603230190278L325.0021620117187,116.08603230190278L324.72276201171877,116.03443230190277L324.50356201171877,115.99153230190277L324.1726620117187,115.91003230190277L323.99206201171876,115.86283230190277C323.80116201171876,115.80813230190277,323.61326201171875,115.74363230190278,323.42906201171877,115.66963230190277L323.35166201171876,115.63963230190276C323.10666201171875,115.54073230190278,322.86826201171874,115.42603230190277,322.63816201171875,115.29623230190278L307.6418220117188,106.63020230190277C306.60166801171874,106.02929230190277,306.08157801171876,105.24380930190277,306.08588101171875,104.45403230190277L305.90106201171875,168.97073230190279C305.90106201171875,169.75613230190277,306.42115201171873,170.54593230190278,307.4613020117188,171.14683230190278L322.45336201171875,179.81293230190278C322.68346201171875,179.94273230190277,322.9217620117187,180.05743230190276,323.16686201171876,180.15623230190278L323.21406201171874,180.17773230190278L323.24416201171874,180.17773230190278C323.42906201171877,180.25073230190276,323.61816201171877,180.3108323019028,323.81156201171876,180.37093230190277L323.85456201171877,180.37093230190277L323.99206201171876,180.40523230190277L324.3187620117188,180.48683230190278L324.40476201171873,180.48683230190278L324.5379620117188,180.51253230190275L324.82166201171873,180.55973230190278L324.92906201171877,180.5812323019028L325.05376201171873,180.5812323019028L325.32016201171876,180.61123230190276L325.4448620117187,180.61123230190276L325.56516201171877,180.61123230190276L325.8316620117188,180.61123230190276L325.96496201171874,180.61123230190276L326.59246201171874,180.61123230190276L326.95356201171876,180.5855323019028L327.09536201171875,180.5855323019028L327.13836201171875,180.5855323019028C327.34036201171875,180.5855323019028,327.54236201171875,180.53833230190276,327.74006201171875,180.50393230190275L327.77016201171875,180.50393230190275L327.9378620117187,180.46963230190278L328.23006201171876,180.40523230190277L328.44076201171873,180.34943230190277L328.71146201171877,180.2721323019028L328.7716620117188,180.2721323019028L328.86196201171873,180.23783230190276C329.0037620117188,180.19063230190278,329.14136201171874,180.13483230190278,329.29176201171873,180.07903230190277L329.4421620117188,180.01463230190276C329.61116201171876,179.94033230190277,329.7761620117187,179.85723230190277,329.93646201171873,179.76573230190277L344.83396201171877,171.12113230190278L344.8984620117187,171.08253230190277L345.03606201171874,170.99233230190276L345.22516201171874,170.86363230190278L345.3755620117187,170.74773230190277L345.5345620117188,170.61463230190276L345.5689620117188,170.5889323019028C345.58656201171874,170.56793230190277,345.60516201171873,170.54783230190276,345.62486201171873,170.52883230190275C345.70386201171874,170.45293230190276,345.7784620117188,170.37273230190277,345.84836201171873,170.2884323019028L345.89566201171874,170.23693230190275L345.93436201171875,170.18113230190278C345.97736201171875,170.12103230190277,346.02036201171876,170.06093230190277,346.05896201171873,169.9965323019028C346.0746620117188,169.96983230190278,346.0918620117188,169.94403230190278,346.11056201171874,169.91933230190278C346.10896201171875,169.90653230190276,346.10896201171875,169.89353230190278,346.11056201171874,169.88073230190275C346.14066201171875,169.82483230190277,346.16216201171875,169.76913230190277,346.18796201171875,169.71753230190276C346.20406201171875,169.68543230190278,346.21836201171874,169.65253230190277,346.2308620117187,169.61883230190278L346.2308620117187,169.58883230190276C346.2308620117187,169.53303230190278,346.26096201171873,169.48153230190277,346.27386201171873,169.43003230190277C346.28586201171873,169.39483230190277,346.29596201171876,169.35903230190277,346.30396201171874,169.32273230190276C346.30596201171875,169.3142323019028,346.30596201171875,169.30543230190278,346.30396201171874,169.29693230190276C346.30396201171874,169.24113230190278,346.30396201171874,169.18533230190278,346.30396201171874,169.12953230190277C346.3058620117188,169.09383230190275,346.3058620117188,169.05793230190278,346.30396201171874,169.02223230190276L346.30396201171874,168.9750323019028L346.48876201171873,104.45834183190277C346.54036201171874,104.53558590190278,346.53176201171874,104.58709730190277,346.52746201171874,104.63860230190276Z" fill="url(#master_svg9_3_5454)" fill-opacity="1"/></g><g><path d="M378.587673828125,143.2258619686508C380.659373828125,144.4191219686508,380.667973828125,146.3549219686508,378.613473828125,147.54812196865083L363.715973828125,156.2056219686508C361.661373828125,157.39882196865082,358.313173828125,157.39882196865082,356.241373828125,156.2056219686508L341.249343828125,147.5610219686508C339.181916828125,146.36782196865082,339.169009828125,144.43202196865082,341.223553828125,143.23873196865082L356.121073828125,134.5941509686508C358.175573828125,133.4009079686508,361.523873828125,133.4009079686508,363.591273828125,134.5941509686508L378.587673828125,143.2258619686508Z" fill="#2564F4" fill-opacity="1"/></g><g><g><path d="M378.51876513671874,199.20955291103363C380.59046513671876,200.40281291103364,380.59906513671876,202.33861291103364,378.54456513671875,203.52751291103363L363.64706513671877,212.17641291103362C361.5924651367188,213.36531291103364,358.24426513671875,213.36961291103364,356.17246513671876,212.17641291103362L341.18043513671876,203.52751291103363C339.11300813671875,202.33861291103364,339.10010113671876,200.39851291103363,341.1546451367187,199.20955291103363L356.03926513671877,190.54351891103363C358.09376513671873,189.35457291103364,361.4420651367187,189.35457291103364,363.50946513671875,190.54351891103363L378.51876513671874,199.20955291103363Z" fill="#0246AF" fill-opacity="1"/></g></g><g><path d="M380.13498662109373,145.5565565604477C380.13498662109373,145.6123575604477,380.13498662109373,145.6681585604477,380.13498662109373,145.7239595604477C380.13498662109373,145.7797605604477,380.13498662109373,145.8140935604477,380.10068662109376,145.8570185604477C380.06628662109375,145.8999435604477,380.07488662109375,145.9643245604477,380.05768662109375,146.0158285604477L380.00178662109374,146.14459056044768C379.98038662109377,146.2009295604477,379.95448662109374,146.25547256044769,379.92438662109373,146.3076985604477C379.92438662109373,146.3463265604477,379.87718662109376,146.38495356044768,379.85568662109375,146.4278835604477L379.73108662109377,146.60816356044768C379.7047866210938,146.64578356044768,379.67608662109376,146.6816335604477,379.64508662109375,146.7154635604477C379.57518662109374,146.7997335604477,379.5004866210937,146.8799735604477,379.42158662109375,146.9558335604477C379.39148662109375,146.9858835604477,379.36568662109374,147.0159235604477,379.33558662109374,147.0416835604477C379.30548662109373,147.06743356044768,379.2280866210938,147.13181356044768,379.17228662109375,147.1747435604477C379.11638662109374,147.2176635604477,379.07768662109373,147.2562935604477,379.0217866210937,147.2949235604477L378.8326866210937,147.4194035604477L378.63498662109373,147.5481635604477L363.71598662109375,156.20560356044768C363.55478662109374,156.2994035604477,363.38828662109376,156.3839035604477,363.21738662109374,156.4588035604477L363.06698662109375,156.52320356044768C362.9293866210937,156.5790035604477,362.79188662109374,156.6305035604477,362.63718662109375,156.6777035604477C362.58558662109374,156.6777035604477,362.53828662109373,156.7164035604477,362.4866866210937,156.7292035604477L362.21598662109375,156.80650356044768C362.14698662109373,156.82960356044768,362.07668662109376,156.8483035604477,362.0052866210938,156.86230356044769C361.91078662109373,156.8881035604477,361.8118866210938,156.9052035604477,361.71308662109374,156.9267035604477C361.6141866210937,156.9481035604477,361.5840866210938,156.9567035604477,361.51528662109376,156.9653035604477C361.31758662109377,157.0039035604477,361.11558662109377,157.0297035604477,360.91358662109377,157.0512035604477L360.7244866210938,157.0512035604477L360.37198662109375,157.0512035604477L360.13988662109375,157.0512035604477L359.8519866210938,157.0512035604477L359.60698662109377,157.0512035604477L359.34048662109376,157.0512035604477L359.09548662109376,157.0297035604477L358.83328662109375,156.9997035604477L358.59688662109374,156.9696035604477L358.31748662109374,156.9181035604477L358.09828662109373,156.8752035604477L357.7715866210938,156.7936035604477L357.5867866210938,156.7464035604477Q357.29448662109377,156.6649035604477,357.01938662109376,156.5533035604477L356.9463866210938,156.52320356044768C356.70028662109377,156.4235035604477,356.46058662109374,156.3088035604477,356.22858662109377,156.17980356044768L341.2365066210937,147.5352735604477C340.19635662109374,146.9343635604477,339.67626762109376,146.1488745604477,339.67626762109376,145.3591035604477L339.56878662109375,188.39740356044769C339.56878662109375,189.1829035604477,340.08457362109374,189.97270356044768,341.12472662109377,190.56930356044768L356.12108662109375,199.2181035604477C356.3514866210937,199.3491035604477,356.59138662109376,199.46240356044768,356.83888662109376,199.5572035604477L356.88188662109377,199.5830035604477L356.9119866210938,199.5830035604477C357.09678662109377,199.6517035604477,357.28588662109377,199.7160035604477,357.47928662109376,199.7718035604477L357.52658662109377,199.7718035604477L357.65978662109376,199.8062035604477L357.9864866210938,199.88340356044768L358.07678662109373,199.88340356044768L358.2099866210938,199.90920356044768L358.48938662109373,199.95640356044768L358.60118662109375,199.97780356044768L358.72578662109373,199.97780356044768L358.98798662109374,200.0079035604477L359.1125866210937,200.0079035604477L359.23298662109374,200.0079035604477L359.49948662109375,200.0079035604477L360.26028662109377,200.0079035604477L360.61698662109376,199.98210356044768L360.7588866210938,199.98210356044768L360.80608662109375,199.98210356044768C361.00808662109375,199.96070356044768,361.2058866210937,199.9349035604477,361.4035866210937,199.90060356044768L361.4336866210937,199.90060356044768L361.6055866210937,199.8620035604477L361.89788662109373,199.8019035604477L362.10418662109373,199.7461035604477L362.37928662109374,199.66880356044769L362.43518662109375,199.66880356044769L362.52968662109373,199.63450356044768C362.67158662109375,199.5873035604477,362.80908662109374,199.5315035604477,362.95948662109373,199.4757035604477L363.10998662109375,199.4113035604477C363.28188662109375,199.33400356044768,363.44948662109374,199.25250356044768,363.60848662109373,199.1623035604477L378.48878662109377,190.54350356044768L378.5532866210938,190.5092035604477L378.69088662109374,190.4148035604477L378.87998662109374,190.29030356044768L379.0260866210937,190.1744035604477L379.18948662109375,190.0413035604477L379.22388662109375,190.0113035604477L379.27538662109373,189.9555035604477C379.35708662109374,189.8739035604477,379.43448662109375,189.7967035604477,379.50328662109376,189.7151035604477C379.57198662109374,189.63360356044768,379.53768662109377,189.68080356044769,379.55048662109374,189.65930356044768L379.58488662109374,189.60780356044768C379.63218662109375,189.5477035604477,379.67088662109376,189.4833035604477,379.70958662109376,189.4233035604477C379.72818662109376,189.3985035604477,379.74538662109376,189.3727035604477,379.76108662109374,189.34600356044768L379.76108662109374,189.3074035604477C379.79118662109374,189.25160356044768,379.81268662109375,189.1958035604477,379.83848662109375,189.1400035604477C379.86428662109375,189.0842035604477,379.86858662109375,189.0799035604477,379.88148662109376,189.04550356044768L379.88148662109376,189.01120356044768C379.90118662109376,188.9610035604477,379.91698662109377,188.90930356044768,379.92878662109376,188.8567035604477C379.92878662109376,188.8181035604477,379.95018662109374,188.7837035604477,379.95878662109374,188.7494035604477C379.95668662109375,188.7395035604477,379.95668662109375,188.7293035604477,379.95878662109374,188.71930356044768C379.95878662109374,188.66350356044768,379.95878662109374,188.6077035604477,379.95878662109374,188.5562035604477C379.96098662109375,188.5191035604477,379.96098662109375,188.4818035604477,379.95878662109374,188.4446035604477L379.95878662109374,188.39740356044769L380.08348662109375,145.3891523604477C380.14798662109376,145.4750025604477,380.13938662109376,145.5050515604477,380.13498662109373,145.5565565604477Z" fill="url(#master_svga_3_5446)" fill-opacity="1"/></g></g><g><g><g transform="matrix(1,-0.002792523242533207,0.002792523242533207,1,-0.5967566780273899,0.6440333427033806)" style="opacity:0.10000000149011612;"><ellipse cx="246.36376285552979" cy="222.79774510860443" rx="15.736016273498535" ry="9.09972858428955" fill="#0246AF" fill-opacity="1"/></g></g><g><path d="M258.40182274414065,220.53344237026215Q258.86172274414065,222.34477237026215,257.2971827441406,222.70961237026214C255.90457274414064,223.03153237026214,254.78274274414062,221.04422237026213,253.17092374414062,219.18569237026213C251.29262274414063,217.03956937026214,253.01619574414062,215.14239237026214,254.83862274414062,217.21125637026213C255.56931274414063,218.03965237026213,256.78569274414065,218.30149237026214,258.40182274414065,220.53344237026215Z" fill="#2564F4" fill-opacity="1"/></g><g><path d="M241.6002953515625,224.32779543959808Q242.3180953515625,226.1777534395981,240.8008353515625,226.73145343959808C239.4598053515625,227.22077343959808,238.5013053515625,226.35803343959807,236.2318653515625,226.48679343959807C233.6529563515625,226.6284334395981,232.1271053515625,224.3106224395981,234.4223353515625,224.13893543959807Q236.0298553515625,224.01875323959808,238.5228053515625,223.92432343959808L241.6002953515625,224.32779543959808Z" fill="#2564F4" fill-opacity="1"/></g><g><path d="M250.68232602539064,174.05272614955902C251.38722602539062,177.91574614955903,252.02762602539062,185.34562614955902,252.66802602539062,193.904326149559C252.8357260253906,196.101926149559,256.39022602539063,201.325626149559,256.89312602539064,204.63492614955902Q257.3960260253906,207.94422614955903,258.4018260253906,220.51622614955903C257.51742602539065,221.31562614955902,256.12912602539063,221.147426149559,255.46182602539062,220.16002614955903Q251.91152602539063,205.56632614955902,250.3040260253906,203.46742614955903C248.69652602539063,201.36852614955902,244.93132602539063,192.08442614955902,243.5172160253906,187.96822614955903Q240.79216602539063,198.54852614955902,240.99418602539063,201.06382614955902C241.19619602539063,203.579026149559,242.40828602539062,206.00422614955903,242.81231602539063,209.72982614955902Q243.21634602539064,213.45552614955903,241.6002260253906,224.32342614955903Q240.02709602539062,225.70982614955904,238.23904602539062,223.89422614955902Q237.26336602539064,207.79402614955902,236.25328602539062,204.97402614955902C235.24321602539064,202.15402614955903,232.81474102539062,185.42712614955903,234.06981602539062,178.07456614955902C242.44266602539062,175.76533614955903,244.66482602539062,176.26323614955902,250.68232602539064,174.05272614955902Z" fill="#0246AF" fill-opacity="1"/></g><g><path d="M267.42379018554686,142.17424549037932L260.15556018554685,155.41582549037935L252.25119018554688,151.45402549037934L259.3475001855469,138.20392549037933L261.3117501855469,139.16967949037934L265.0769901855469,141.02393549037933L267.42379018554686,142.17424549037932Z" fill="#2564F4" fill-opacity="1"/></g><g><path d="M265.0769270703125,141.02395002651215L264.1485170703125,142.70650002651215L260.4219970703125,140.83509002651215L261.3117110703125,139.16970002651215L265.0769270703125,141.02395002651215Z" fill="#0246AF" fill-opacity="1"/></g><g transform="matrix(0.43569421768188477,-0.900094747543335,0.9005424380302429,0.43476811051368713,17.74613363197841,313.65369189718865)"><rect x="258.9460144042969" y="142.5569680929184" width="0.35207635164260864" height="5.061644554138184" rx="0" fill="#D5E0FC" fill-opacity="1"/></g><g transform="matrix(0.43553709983825684,-0.9001708030700684,0.9006181359291077,0.43461117148399353,16.426776951506866,313.81847235035093)"><rect x="258.36865234375" y="143.69324433803558" width="0.3520762622356415" height="5.061644554138184" rx="0" fill="#D5E0FC" fill-opacity="1"/></g><g transform="matrix(0.43553709983825684,-0.9001708030700684,0.9006181359291077,0.43461117148399353,15.085596292743134,313.9166708608568)"><rect x="257.7757873535156" y="144.81084382534027" width="0.3520762622356415" height="5.061644554138184" rx="0" fill="#D5E0FC" fill-opacity="1"/></g><g transform="matrix(0.43553709983825684,-0.9001708030700684,0.9006181359291077,0.43461117148399353,13.74948882852695,314.018958711094)"><rect x="257.188720703125" y="145.92644441127777" width="0.3520762622356415" height="5.061644554138184" rx="0" fill="#D5E0FC" fill-opacity="1"/></g><g transform="matrix(0.43553709983825684,-0.9001708030700684,0.9006181359291077,0.43461117148399353,12.416222623703646,314.1085516050166)"><rect x="256.59295654296875" y="147.03343904018402" width="0.3520762622356415" height="5.061644554138184" rx="0" fill="#D5E0FC" fill-opacity="1"/></g><g><path d="M264.0281408691406,148.36368215346528C263.47794086914064,148.93884015346526,262.78594086914063,151.07638515346528,261.93924086914063,150.05482515346526C261.50944086914063,149.56122515346527,261.70714086914063,151.93482515346528,261.6340408691406,152.30395515346527C261.56104086914064,152.67308515346528,255.32863086914062,157.70788515346527,255.32863086914062,157.71218515346527Q254.3787308691406,155.83217515346527,252.77981086914062,151.93053515346526L249.37564086914062,153.89637515346527Q252.28551086914064,159.97415515346526,253.16664086914062,160.97855515346527C253.20951086914062,161.02605515346528,253.25702086914063,161.06925515346526,253.30847086914062,161.10735515346528C253.32781086914062,161.12265515346527,253.34789086914063,161.13695515346527,253.36866086914063,161.15025515346528L253.46322086914063,161.21465515346526C256.4117608691406,163.18045515346526,262.45074086914065,153.16239515346527,262.83754086914064,152.87910515346528C263.22434086914063,152.59581515346528,263.72294086914064,151.38969515346528,263.9121408691406,150.73298515346528C264.1012408691406,150.07626515346527,264.7760408691406,147.57819415346526,264.0281408691406,148.36368215346528Z" fill="#D5E0FC" fill-opacity="1"/></g><g><path d="M249.39281873046875,145.87416779994965Q252.10927873046876,148.23060779994964,255.04063873046874,154.88787779994965Q251.96313873046876,158.09416779994964,249.02317873046874,157.13696779994964C248.09648873046876,154.81898779994964,247.31697273046876,152.44496779994964,246.68927173046876,150.02905779994964Q245.79093973046875,146.38064879994965,249.39281873046875,145.87416779994965Z" fill="#0246AF" fill-opacity="1"/></g><g><path d="M234.06984979882813,178.09598884487153Q246.6979187988281,182.6586888448715,251.38721879882812,174.80388884487152Q249.10491879882812,165.81158884487152,249.50891879882812,162.4335888448715C249.83131879882814,159.73808884487153,252.29411879882812,146.7626588448715,248.76531879882813,145.4792808448715C245.13771879882813,144.1615588448715,236.5327187988281,148.4237488448715,234.97676879882812,152.05069884487153C233.97530279882812,154.3813888448715,235.14440879882812,160.39908884487153,235.14440879882812,167.21518884487153C235.14439879882812,170.98808884487153,233.1113507988281,174.60638884487153,234.06984979882813,178.09598884487153Z" fill="url(#master_svgb_3_5510)" fill-opacity="1"/></g><g><path d="M236.08991118164062,158.9612290304184Q230.63981118164062,165.0261290304184,229.11401118164062,165.0004290304184C226.89181118164063,164.96602903041838,218.91009118164064,154.57024903041838,217.75388118164062,152.9821090304184Q214.74514818164062,151.2308790304184,215.47584518164064,149.74575903041838C216.20654118164063,148.2606290304184,214.85260318164063,146.7411900304184,215.26523808164063,146.5051217304184C215.67787318164062,146.2690540304184,215.85838918164063,146.8914210304184,216.25812118164063,147.6683190304184C216.59337118164063,148.3250290304184,216.9458311816406,148.81004903041838,217.40574118164062,148.7156190304184C217.86565118164063,148.6211890304184,218.46309118164064,148.7928790304184,218.56195118164064,149.14484903041838Q218.6608111816406,149.4968190304184,219.33992118164062,151.6429390304184Q227.7858111816406,160.0900290304184,228.75291118164063,159.7509290304184Q229.83181118164063,159.3689290304184,233.10271118164061,155.42009903041838L236.08991118164062,158.9612290304184Z" fill="#D5E0FC" fill-opacity="1"/></g><g><path d="M235.29055096679687,151.45409525112152Q231.75744096679688,155.40725025112152,229.50949096679688,157.94396025112152Q232.2947209667969,162.99168025112152,234.4738909667969,163.59688025112152Q237.86945096679688,159.24023025112152,239.48127096679687,157.52761025112153C241.09309096679686,155.81500025112152,238.66463096679686,149.70715025112153,235.29055096679687,151.45409525112152Z" fill="#0246AF" fill-opacity="1"/></g><g><path d="M240.6245925722656,145.0457914962387Q240.71056057226562,146.89145149623872,240.39248657226562,147.2777614962387Q244.31242657226562,148.56543149623872,245.73942657226561,147.1833314962387Q246.01880657226562,144.0457024962387,246.39704657226562,143.1700814962387L240.6245925722656,145.0457914962387Z" fill="#D5E0FC" fill-opacity="1"/></g><g><path d="M246.56034962890624,142.8223818429184C246.73656962890624,142.1570818429184,249.30686962890624,137.5472118429184,246.56034962890624,135.14355184291838C243.81380962890626,132.7398948429184,239.35229962890625,132.6025398429184,237.93389962890626,134.21643184291838C236.51548772890624,135.8303118429184,236.46391162890626,136.9033718429184,236.69601762890625,137.7661018429184C236.92812262890624,138.6288418429184,236.72180562890625,142.0583418429184,236.82066862890625,142.8051918429184Q236.91953062890624,143.5520118429184,237.86511962890626,145.7668118429184C239.03151962890624,146.2067118429184,240.33376962890625,146.10281184291838,241.41542962890625,145.4835118429184Q246.16060962890626,144.3461118429184,246.56034962890624,142.8223818429184Z" fill="#D5E0FC" fill-opacity="1"/></g><g><path d="M240.67179903320311,140.9381161397934Q240.28925903320314,139.4830161397934,241.48844903320312,139.30704613979339C242.68764903320312,139.1310761397934,242.90255903320312,140.2856761397934,242.75641903320312,140.8823061397934C242.61028903320312,141.4789161397934,242.15037903320314,142.62061613979338,241.78073903320313,142.8996161397934Q243.19484903320313,144.3461161397934,243.07019903320312,145.0758161397934Q245.21928903320313,146.0416161397934,246.2938290332031,145.0458161397934C246.82250903320312,142.9769161397934,251.57630903320313,139.4873261397934,248.30540903320312,134.8216661397934Q248.30540903320312,131.2591091397934,243.92982903320313,130.9157221597934C243.23782903320313,130.8599209397934,240.77496903320312,131.3449461397934,238.56140903320312,131.1303341397934C235.73749503320312,130.8556310397934,236.59284283320312,134.4868661397934,237.39229903320313,134.8989261397934C238.25193903320312,135.3281461397934,240.52567903320312,134.7143561397934,241.10162903320312,135.9591061397934C241.44978903320313,136.7188261397934,240.83944903320312,137.0021161397934,239.98409903320314,137.9120661397934C239.83316903320312,138.8947461397934,239.80140903320313,139.8920261397934,239.88953903320314,140.8823061397934C240.08294903320314,141.0282161397934,240.3924190332031,140.9424161397934,240.67179903320311,140.9381161397934Z" fill="#0246AF" fill-opacity="1"/></g></g><g><g><path d="M156.10931989746092,274.9675979269028C157.91031989746094,276.0062979269028,157.92321989746094,277.69319792690277,156.13081989746092,278.7318979269028L139.79771989746092,288.2091979269028C137.75221989746095,289.24329792690276,135.33581989746094,289.24329792690276,133.29031989746093,288.2091979269028L116.85405989746094,278.7318979269028C115.04882289746094,277.69319792690277,115.04452089746094,276.0062979269028,116.85405989746094,274.9675979269028L133.18711989746095,265.49462192690277C135.23101989746095,264.4535229269028,137.65071989746093,264.4535229269028,139.69461989746094,265.49462192690277L156.10931989746092,274.9675979269028Z" fill="url(#master_svgc_3_5497)" fill-opacity="1"/></g><g><path d="M152.0304872314453,276.86051018276214L148.4371872314453,278.96371018276216L137.96248723144532,285.0458101827621C137.5212872314453,285.2442101827621,137.0405872314453,285.33961018276216,136.5569872314453,285.3248101827621C136.06938723144532,285.3429101827621,135.5845872314453,285.24431018276215,135.14288723144531,285.0372101827621L124.53925723144532,278.9122101827621L120.92878723144531,276.84335018276215L135.00108723144533,268.68808718276216C135.9022872314453,268.30743368276217,136.9193872314453,268.30743368276217,137.8206872314453,268.68808718276216L152.0304872314453,276.86051018276214Z" fill="#2564F4" fill-opacity="1"/></g><g><path d="M148.4371608642578,278.9636884737778L137.96246086425782,285.04580847377775C137.5212608642578,285.24420847377775,137.0406608642578,285.3396084737778,136.5569608642578,285.32480847377775C136.06936086425782,285.34290847377775,135.5845608642578,285.2443084737778,135.1428608642578,285.03720847377775L124.53926086425781,278.91218847377775L135.0182608642578,272.8300854737778C135.91946086425781,272.4494319737778,136.93666086425782,272.4494319737778,137.8378608642578,272.8300854737778L148.4371608642578,278.9636884737778Z" fill="#0246AF" fill-opacity="1"/></g><g><g><path d="M156.10930463867186,302.1417922628403C157.91030463867187,303.1804922628403,157.92320463867188,304.86739226284027,156.13080463867186,305.9060922628403L139.79770463867186,315.3833922628403C137.75340463867187,316.4223922628403,135.33470463867187,316.4223922628403,133.29030463867187,315.3833922628403L116.85404463867188,305.9060922628403C115.04880763867187,304.86739226284027,115.04450563867188,303.1804922628403,116.85404463867188,302.1417922628403L133.18710463867188,292.66881626284027C135.2310046386719,291.6277172628403,137.65070463867187,291.6277172628403,139.69460463867188,292.66881626284027L156.10930463867186,302.1417922628403Z" fill="#0246AF" fill-opacity="1"/></g></g><g><path d="M157.4633266357422,276.9978396456528C157.46732663574218,277.04641064565277,157.46732663574218,277.0952166456528,157.4633266357422,277.14378764565276C157.45682663574217,277.18284864565277,157.44822663574217,277.2215426456528,157.4376266357422,277.2596866456528C157.4376266357422,277.3068946456528,157.4118266357422,277.3498326456528,157.39462663574218,277.3970406456528C157.3815266357422,277.4353156456528,157.3657266357422,277.47259564565275,157.34732663574218,277.5086436456528C157.32942663574218,277.5588126456528,157.30792663574218,277.60759264565274,157.2828266357422,277.6545916456528L157.2184266357422,277.75329964565276C157.18562663574218,277.8095996456528,157.14972663574218,277.86406964565276,157.1109266357422,277.9164096456528L157.0378266357422,278.00655964565277C156.9777266357422,278.0795196456528,156.91322663574218,278.1482096456528,156.8444266357422,278.21686964565276L156.76702663574218,278.2941296456528C156.7217266357422,278.3336896456528,156.6743266357422,278.37093964565275,156.6252266357422,278.4057296456528C156.5841266357422,278.4424096456528,156.5411266357422,278.47677964565275,156.49632663574218,278.5087396456528L156.33292663574218,278.62034964565277C156.27642663574218,278.6609796456528,156.2176266357422,278.6982596456528,156.1567266357422,278.7319496456528L139.8236266357422,288.20925964565276C139.6842266357422,288.28835964565275,139.54082663574218,288.3599596456528,139.3938266357422,288.4238596456528L139.2605266357422,288.48395964565276C139.14452663574218,288.5311596456528,139.0241266357422,288.57835964565277,138.89952663574218,288.6169596456528L138.7663266357422,288.6641596456528L138.52992663574219,288.73285964565275L138.3493266357422,288.7800596456528L138.09572663574218,288.83585964565276L137.9238266357422,288.87025964565277C137.7519266357422,288.9002596456528,137.5757266357422,288.92175964565274,137.3994266357422,288.94315964565277L137.23612663574218,288.94315964565277L136.9223266357422,288.9646596456528L136.2604266357422,288.9646596456528L136.0283266357422,288.9646596456528L135.8134266357422,288.9646596456528L135.5856266357422,288.93885964565277L135.3793266357422,288.9088596456528L135.11282663574218,288.83585964565276L134.91942663574218,288.79715964565275L134.63572663574217,288.72855964565275L134.47672663574218,288.6856596456528C134.3104266357422,288.63885964565276,134.14682663574217,288.58295964565275,133.98672663574217,288.5182596456528L133.9179266357422,288.4924596456528C133.7056266357422,288.40675964565276,133.49892663574218,288.3078596456528,133.2990266357422,288.1962596456528L116.86272663574219,278.71902964565277C115.95581363574219,278.19538964565277,115.5045027357422,277.50861764565275,115.5045027357422,276.8261656456528L115.45292663574219,295.55755964565276C115.45292663574219,296.2399596456528,115.90423763574219,296.9267596456528,116.8111566357422,297.4503596456528L133.2431266357422,306.9276596456528C133.44402663574218,307.0400596456528,133.65222663574218,307.1389596456528,133.86632663574218,307.2238596456528L133.9050266357422,307.2238596456528L133.9308266357422,307.2238596456528C134.09242663574219,307.28855964565275,134.25742663574218,307.34445964565276,134.42512663574217,307.3912596456528L134.46382663574218,307.3912596456528L134.5841266357422,307.42125964565275L134.86782663574218,307.4899596456528L134.9452266357422,307.4899596456528L135.06122663574217,307.4899596456528L135.30192663574218,307.53285964565276L135.4008266357422,307.53285964565276L135.50822663574218,307.53285964565276L135.74032663574218,307.5585596456528L135.8478266357422,307.5585596456528L135.97242663574218,307.5585596456528L136.20882663574218,307.5585596456528L136.83212663574218,307.5585596456528L137.1458266357422,307.53715964565276L137.2705266357422,307.53715964565276L137.3049266357422,307.53715964565276C137.4854266357422,307.53715964565276,137.65732663574218,307.4942596456528,137.8292266357422,307.4641596456528L137.85502663574218,307.4641596456528L138.0055266357422,307.43415964565276L138.25912663574218,307.3783596456528L138.43962663574217,307.33115964565275L138.67602663574218,307.26245964565277L138.72762663574218,307.26245964565277L138.8092266357422,307.2281596456528C138.93392663574218,307.1894596456528,139.0542266357422,307.14225964565276,139.17032663574219,307.0950596456528L139.29922663574217,307.03925964565275C139.4497266357422,306.97055964565277,139.59582663574218,306.8975596456528,139.72902663574217,306.8203596456528L156.06212663574217,297.3430596456528L156.11802663574218,297.3087596456528L156.2384266357422,297.23145964565276L156.4017266357422,297.11985964565275C156.4465266357422,297.08785964565277,156.48962663574218,297.0535596456528,156.53062663574218,297.01685964565274L156.6725266357422,296.9052596456528L156.69832663574218,296.8794596456528L156.74562663574218,296.82795964565275C156.8159266357422,296.7621596456528,156.8819266357422,296.6919596456528,156.94332663574218,296.6176596456528L156.9820266357422,296.57475964565276C156.9923266357422,296.55825964565275,157.0038266357422,296.5424596456528,157.0163266357422,296.5275596456528L157.1238266357422,296.3644596456528L157.17112663574218,296.30005964565277L157.17112663574218,296.2657596456528C157.1969266357422,296.2184596456528,157.2183266357422,296.16695964565275,157.2398266357422,296.1197596456528C157.2545266357422,296.0934596456528,157.2674266357422,296.0662596456528,157.2785266357422,296.0382596456528Q157.2785266357422,296.0382596456528,157.2785266357422,296.00815964565277C157.2939266357422,295.96315964565275,157.30692663574217,295.9172596456528,157.3172266357422,295.8708596456528C157.32782663574218,295.8413596456528,157.33642663574219,295.8112596456528,157.34302663574218,295.78065964565275C157.3450266357422,295.7721596456528,157.3450266357422,295.76335964565277,157.34302663574218,295.7549596456528C157.34302663574218,295.70765964565277,157.34302663574218,295.6561596456528,157.34302663574218,295.60895964565276C157.3451266357422,295.57755964565274,157.3451266357422,295.54605964565275,157.34302663574218,295.51455964565275C157.3451266357422,295.5017596456528,157.3451266357422,295.4886596456528,157.34302663574218,295.47585964565275L157.39462663574218,276.74455964565277C157.4633266357422,276.9077196456528,157.4633266357422,276.9506316456528,157.4633266357422,276.9978396456528Z" fill="url(#master_svgd_3_5487)" fill-opacity="1"/></g><g><path d="M146.7179289892578,248.91803135463715C144.99864898925782,249.64342135463716,142.87104898925782,246.14953135463713,141.7234389892578,243.93475135463714C139.66460998925783,245.65164135463715,140.4984529892578,248.65621135463715,144.1132289892578,251.54059135463714Q141.5343159892578,260.36111135463716,150.6722389892578,263.27981135463716C151.1321389892578,260.70451135463713,149.28823898925782,255.60961135463714,150.3756789892578,255.85431135463713C153.08783898925782,256.46381135463713,152.4044389892578,261.5415113546371,152.00043898925782,263.63181135463714C154.23783898925782,264.18631135463716,156.6022389892578,263.8798113546371,158.62383898925782,262.7734113546371C157.9232389892578,260.00061135463716,153.6723389892578,255.35641135463715,154.6824389892578,255.13321135463715C157.0507389892578,254.60951135463714,158.9548389892578,259.73441135463713,159.70273898925782,262.1038113546372C161.4478389892578,260.8633113546372,162.84043898925782,259.14211135463717,164.0224389892578,257.47251135463716C162.24293898925782,255.98731135463714,159.9305389892578,254.60521135463713,160.33453898925782,254.24041135463716C161.2758389892578,253.38191135463714,163.1756389892578,255.04301135463714,164.6327389892578,256.60541135463717C166.1887389892578,254.30481135463714,167.3664389892578,252.29173135463714,168.53983898925782,252.06852135463714C165.33013898925782,249.40879135463715,161.8084389892578,247.14879135463715,158.0522389892578,245.33829135463714C157.7040389892578,247.17965135463714,157.80723898925783,249.48031135463714,157.1926389892578,249.20131135463714C155.67533898925782,248.51456135463715,156.2083389892578,246.40706135463714,156.88313898925782,244.81465135463714C154.8126389892578,243.90121135463716,152.63923898925782,243.24113535463715,150.4100589892578,242.84879835463715C150.5776889892578,245.31254135463715,152.67093898925782,249.36442135463716,151.7554389892578,249.28716135463713C149.48595898925782,249.08971135463713,149.21516898925782,244.79746135463714,149.21946898925782,242.68998735463714C146.2709189892578,242.38522835463715,144.0960389892578,242.68998735463714,142.6690389892578,243.34671235463713C144.1390189892578,245.72460135463714,147.44001898925782,248.63046135463713,146.7179289892578,248.91803135463715Z" fill="url(#master_svge_3_5490)" fill-opacity="1"/></g><g><path d="M128.51511868652344,233.69768884487152C127.79302868652344,235.10558884487153,123.85588868652344,234.4917888448715,121.50478168652344,233.98528884487152C121.20820568652344,236.1313888448715,123.89456868652344,237.24738884487152,128.46783868652344,236.65078884487153Q132.71012868652343,242.9302888448715,141.26352868652344,239.0629888448715C139.80642868652345,237.4061888448715,134.97532868652343,235.76658884487154,135.92092868652344,235.25148884487152C138.27632868652344,233.96378884487152,141.29792868652345,237.1057888448715,142.45842868652343,238.46638884487152C144.74502868652343,237.21728884487152,145.99152868652345,235.69358884487153,146.60612868652345,234.08398884487153C144.18632868652344,233.01098884487152,137.94102868652345,233.03668884487152,138.50842868652344,232.31989884487152C139.83652868652342,230.63304884487152,144.74072868652343,232.25551884487152,146.91132868652343,233.08388884487152C147.22662868652344,231.41177884487152,147.18712868652344,229.69216884487153,146.79532868652345,228.03623884487152C144.50002868652342,228.29376884487152,141.89102868652344,228.9247288448715,141.92972868652345,228.46545884487153C142.01572868652343,227.4524988448715,144.50862868652342,227.21211884487153,146.62332868652345,227.17778884487151C146.15052868652344,225.03166884487152,145.60042868652343,223.23751184487153,146.28382868652344,222.42198884487152C142.16292868652343,222.89886684487152,138.09802868652343,223.77282884487153,134.14572868652343,225.03166884487152C135.16442868652345,226.22490884487152,136.82782868652345,227.3966988448715,136.17882868652345,227.60700884487153C134.62282868652343,228.13924884487153,133.54402868652343,226.68846884487152,132.92932868652343,225.43513884487152C130.84330868652344,226.17278884487152,128.83846868652344,227.12204884487153,126.94627868652344,228.26801884487153C128.76871868652344,229.49130884487153,133.06262868652342,230.41413884487153,132.35342868652344,230.9249188448715C130.59973868652344,232.16537884487153,127.44056868652343,230.02354884487153,125.98349868652343,228.88609884487153C123.67106868652344,230.46993884487154,122.30854668652344,231.91642884487152,121.76267568652344,233.12258884487153C124.44903868652344,233.50888884487154,128.82028868652344,233.10538884487153,128.51511868652344,233.69768884487152Z" fill="url(#master_svgf_3_5494)" fill-opacity="1"/></g><g><path d="M128.46777746582032,236.65080964565277Q114.22359746582032,251.17140964565277,135.54262746582032,279.7621096456528Q136.9910274658203,280.5776096456528,137.43382746582031,279.09250964565274C137.4123274658203,279.09250964565274,119.4115074658203,254.40780964565278,128.46777746582032,236.65080964565277Z" fill="#97B2F8" fill-opacity="1"/></g><g><path d="M127.17828410644532,256.7126736837387C128.27428410644532,254.2575736837387,132.7658841064453,256.5452736837387,135.4135841064453,258.1806736837387C136.1399841064453,254.2317736837387,133.1999841064453,251.3130436837387,127.75848410644531,251.13707368373872Q123.92028410644531,238.04574368373872,113.2521641064453,242.9002636837387C114.65768410644532,246.45852368373872,120.00458410644531,250.93962368373872,118.80968410644532,251.6435736837387C115.83108410644532,253.38617368373872,112.86103410644532,246.59587368373872,111.75210410644532,243.6857536837387C108.85942410644532,245.40264368373872,107.13585410644531,247.9178936837387,106.13438410644531,250.7851036837387C108.76486410644532,253.5106736837387,116.0588841064453,255.24907368373871,115.26798410644531,256.44657368373873C113.41979410644531,259.2536736837387,107.9868941064453,254.7811736837387,105.59710410644531,252.5835736837387C104.8406291064453,255.6911736837387,104.73747010644531,259.0562736837387,104.83632610644531,262.1638736837387C107.56137410644531,262.3397736837387,110.71624410644532,261.8977736837387,110.59588410644531,262.7132736837387C110.31220410644531,264.6061736837387,107.35935410644531,264.3399736837387,104.88790210644531,263.7734736837387C105.05982710644531,267.9926736837387,105.38219110644532,271.4994736837387,104.45808410644531,272.86437368373873C109.3751041064453,273.1469736837387,114.30610410644532,272.6588736837387,119.07188410644531,271.4178736837387C118.0961841064453,268.8640736837387,116.35978410644532,266.1684736837387,117.15488410644531,265.9366736837387C119.06758410644531,265.3787736837387,120.06908410644532,268.4261736837387,120.56338410644531,270.9757736837387C123.21628410644531,270.16487368373873,125.73588410644531,268.9703736837387,128.04218410644532,267.4303736837387C126.12948410644532,264.5932736837387,121.28548410644531,261.5929736837387,122.2009841064453,260.8460736837387C124.47038410644531,259.00477368373873,127.78858410644531,263.9665736837387,129.2714841064453,266.5289736837387C132.28018410644532,264.19837368373874,134.1026841064453,261.8590736837387,134.9579841064453,259.73007368373874C131.89338410644532,258.2321736837387,126.71838410644531,257.7428736837387,127.17828410644532,256.7126736837387Z" fill="url(#master_svgg_3_5500)" fill-opacity="1"/></g><g><path d="M144.25933777832032,251.56198823451996Q136.4409447783203,256.04308823452,137.8120677783203,279.05808823451997Q136.9524277783203,280.47018823452,136.0927937783203,279.48728823451995C136.0627097783203,279.49588823451995,132.8992477783203,258.03039823451996,144.25933777832032,251.56198823451996Z" fill="#97B2F8" fill-opacity="1"/></g><g><path d="M146.36547297363282,267.5978325167465C142.35528297363282,263.3270505167465,137.4123729736328,257.3866025167465,137.79491297363282,279.05815251674653Q136.0240593736328,280.8136525167465,136.07563552363283,279.4873525167465C136.5140519736328,263.9665925167465,139.3078729736328,257.3865725167465,146.36547297363282,267.5978325167465Z" fill="#97B2F8" fill-opacity="1"/></g><g><path d="M127.75849914550781,251.13710601284026C136.9866991455078,245.18806601284027,145.7420991455078,253.25317601284027,135.2760291455078,279.0581360128403Q137.1070491455078,280.1827360128403,137.79479914550782,279.0581360128403C148.9570991455078,260.85043601284025,140.6186991455078,239.90431601284027,127.75849914550781,251.13710601284026Z" fill="#97B2F8" fill-opacity="1"/></g><g><path d="M145.81518350097656,270.1474076534653C145.47563350097656,268.79107765346527,141.94682350097656,268.5292276534653,139.84071350097656,268.49917765346527C140.01263850097655,266.6020176534653,142.55286350097657,266.16849465346525,146.36535350097657,267.59781765346526Q151.27821350097656,263.04805765346526,157.85871350097656,268.0871376534653C156.27261350097655,269.22029765346525,151.78961350097657,269.66238765346526,152.49881350097655,270.29335765346525C154.26971350097656,271.8686076534653,157.49761350097657,269.77828765346527,158.76561350097657,268.8382776534653C160.48491350097657,270.3706176534653,161.24991350097656,271.9329976534653,161.45631350097656,273.4395576534653C159.15671350097657,273.86877765346526,153.79261350097656,272.58110765346527,154.14931350097658,273.3365476534653C154.95311350097657,275.05343765346527,159.49631350097656,274.6242176534653,161.52931350097657,274.3623976534653C161.46511350097657,275.86371765346524,161.08581350097657,277.33471765346525,160.41611350097656,278.68041765346527C158.49481350097656,278.00221765346527,156.37581350097656,276.93771765346526,156.31991350097655,277.31971765346526C156.19101350097657,278.2082176534653,158.28851350097656,278.9122176534653,160.10661350097655,279.3543176534653C159.24701350097655,281.11841765346526,158.43461350097655,282.53911765346527,158.85591350097656,283.37611765346526C155.40521350097657,282.1430176534653,152.08281350097656,280.5775176534653,148.93566350097657,278.7018176534653C150.05321350097657,277.87771765346525,151.72091350097656,277.20381765346525,151.20941350097655,276.8819176534653C149.97151350097656,276.11361765346527,148.75513350097657,277.1437176534653,147.97287350097656,278.1009176534653C146.32685350097657,277.06071765346525,144.79032350097657,275.85711765346525,143.38671350097655,274.50834765346525C145.20054350097655,273.8215976534653,149.08180350097655,273.87739765346527,148.57461350097657,273.30222765346525C147.31094350097655,271.8857876534653,144.16468350097657,273.0962076534653,142.68610350097657,273.77865765346525C141.00981350097655,271.9544576534653,140.10719250097657,270.4392776534653,139.90088130097655,269.2889576534653C142.27778350097657,269.4949776534653,145.95702350097656,270.7182576534653,145.81518350097656,270.1474076534653Z" fill="url(#master_svgh_3_5478)" fill-opacity="1"/></g></g><g><g><g transform="matrix(0.002792523242533207,-0.9999961256980896,0.9999961256980896,0.002792523242533207,-12.128587028393213,645.8604450176169)"><ellipse cx="335.61612701416016" cy="359.86383759975433" rx="17.847145080566406" ry="30.852371215820312" fill="#0246AF" fill-opacity="1"/></g></g><g><g><path d="M367.10728046875,248.85787510463715L348.53048046875,263.88075510463716L323.72998046875,252.72089510463715C326.94071046875,250.17559510463715,331.26041046875,248.11962510463715,336.34088046875,246.81047510463713C346.50608046875,244.19651510463714,358.25728046874997,244.98629510463715,367.10728046875,248.85787510463715Z" fill="#2564F4" fill-opacity="1"/></g><g><path d="M367.1072194824219,248.85790193080902L367.28351948242187,273.319401930809L348.2812194824219,288.37660193080904L348.2812194824219,263.77340193080903L367.1072194824219,248.85790193080902Z" fill="#97B2F8" fill-opacity="1"/></g><g><path d="M348.53048046875,263.57601745815276L348.70668046875,288.03751745815276L323.91049646875,277.1953174581528L323.72998046875,252.73381745815277L348.53048046875,263.57601745815276Z" fill="#0246AF" fill-opacity="1"/></g></g><g><g><path d="M348.61208310546874,273.4867751241684L320.12376310546875,280.8092751241684C319.85728310546875,280.4401751241684,319.61228310546875,280.0667751241684,319.38018310546875,279.6890751241684C319.31142310546875,279.5688751241684,319.25982310546874,279.4486751241684,319.19106310546874,279.3327751241684C319.04491310546877,279.0666751241684,318.89449310546877,278.8048751241684,318.76124310546874,278.5386751241684L318.62370310546873,278.2167751241684C318.50334110546873,277.9377751241684,318.37870310546873,277.6544751241684,318.27555110546876,277.3583751241684C318.24976310546873,277.2939751241684,318.24115810546874,277.2252751241684,318.21537010546876,277.1608751241684C317.58646170546876,275.3202751241684,317.45744310546877,273.3459751241684,317.84143010546876,271.4393351241684C317.86291610546874,271.3277351241684,317.90161110546876,271.2204251241684,317.92739910546874,271.1088251241684C317.97037010546876,270.90280512416837,318.02624910546876,270.6796051241684,318.08643010546876,270.4950351241684C318.14661110546876,270.3104751241684,318.20248910546877,270.1173151241684,318.27124910546877,269.9241651241684C318.30994410546873,269.8125651241684,318.35291510546875,269.6966651241684,318.40018910546877,269.5850851241684C319.20019310546877,267.5890251241684,320.41121310546873,265.7830251241684,321.95479310546875,264.28417512416837L322.41040310546873,263.8549551241684L322.81013310546876,263.4901231241684C323.13249310546877,263.2068471241684,323.45485310546877,262.9192481241684,323.8073131054687,262.6316751241684L342.39698310546873,270.7654751241684L348.61208310546874,273.4867751241684Z" fill="#2564F4" fill-opacity="1"/></g><g><path d="M348.6121098144531,273.486808180809L348.79270981445313,297.948308180809L320.30432581445314,305.270808180809L320.1238098144531,280.80936818080903L348.6121098144531,273.486808180809Z" fill="#0246AF" fill-opacity="1"/></g></g><g><g><path d="M379.6493563964844,285.4020569112778C379.6493563964844,285.4749569112778,379.6493563964844,285.54795691127777,379.6493563964844,285.62095691127774C379.6493563964844,285.6939569112778,379.6493563964844,285.84415691127776,379.6493563964844,285.9514569112778C379.65155639648435,285.98005691127776,379.65155639648435,286.00875691127777,379.6493563964844,286.03735691127775C379.6493563964844,286.1746569112778,379.6493563964844,286.30775691127775,379.6192563964844,286.4450569112778C379.6213563964844,286.4779569112778,379.6213563964844,286.5109569112778,379.6192563964844,286.5437569112778C379.6192563964844,286.65105691127775,379.6192563964844,286.7584569112778,379.5848563964844,286.8657569112778C379.5827563964844,286.9043569112778,379.5827563964844,286.94295691127775,379.5848563964844,286.98165691127775C379.5848563964844,287.1060569112778,379.5461563964844,287.23055691127774,379.5246563964844,287.35935691127776C379.52675639648436,287.3692569112778,379.52675639648436,287.37945691127777,379.5246563964844,287.3893569112778C379.49885639648437,287.52675691127774,379.47305639648437,287.6640569112778,379.44295639648436,287.81855691127777L379.4172563964844,287.93025691127775C379.4172563964844,288.03755691127776,379.3699563964844,288.14055691127777,379.3398563964844,288.2478569112778L379.3140563964844,288.3508569112778C379.27965639648437,288.48815691127777,379.24095639648436,288.6212569112778,379.1980563964844,288.7543569112778C379.20045639648436,288.77855691127775,379.20045639648436,288.8030569112778,379.1980563964844,288.8272569112778C379.1636563964844,288.94315691127775,379.1249563964844,289.05475691127776,379.0862563964844,289.1663569112778L379.04755639648437,289.2822569112778C379.00025639648436,289.4110569112778,378.9487563964844,289.5440569112778,378.8971563964844,289.6771569112778L378.8971563964844,289.69855691127776C378.84125639648437,289.8402569112778,378.78535639648436,289.97755691127776,378.72515639648435,290.1278569112778L378.6736563964844,290.2394569112778C378.62205639648437,290.35525691127776,378.56615639648436,290.4711569112778,378.51025639648435,290.5913569112778L378.47585639648435,290.65575691127776C378.41145639648437,290.7931569112778,378.34265639648436,290.93045691127776,378.2695563964844,291.0849569112778L378.21805639648437,291.1794569112778C378.14065639648436,291.32105691127776,378.0589563964844,291.46695691127775,377.97305639648437,291.60865691127776C377.9752563964844,291.6185569112778,377.9752563964844,291.6287569112778,377.97305639648437,291.6386569112778C377.88705639648435,291.7888569112778,377.7924563964844,291.9391569112778,377.69795639648436,292.0678569112778L377.6377563964844,292.16235691127775C377.5431563964844,292.3082569112778,377.44435639648435,292.4541569112778,377.3454563964844,292.5915569112778L377.2938563964844,292.66025691127777L377.00595639648435,293.05935691127775L376.9457563964844,293.1366569112778L376.8382563964844,293.27395691127776L376.7136563964844,293.4328569112778L376.6018563964844,293.57015691127776L376.4729563964844,293.72895691127775L376.3525563964844,293.86635691127776L376.2193563964844,294.02085691127775C376.1806563964844,294.0680569112778,376.1419563964844,294.11525691127775,376.09895639648437,294.1581569112778L375.9614563964844,294.31275691127775L375.83675639648436,294.4500569112778L375.6949563964844,294.60025691127777L375.5660563964844,294.7333569112778L375.41985639648436,294.88355691127776L375.2823563964844,295.0166569112778L375.13615639648435,295.16685691127776L374.99435639648436,295.29985691127774L374.86535639648434,295.42005691127775L374.4097563964844,295.84935691127777L374.3237563964844,295.92225691127777C374.1604563964844,296.0639569112778,373.9971563964844,296.20985691127777,373.8252563964844,296.35145691127775C373.6575563964844,296.48885691127776,373.4856563964844,296.6262569112778,373.3094563964844,296.78075691127776L373.2320563964844,296.8451569112778C373.0601563964844,296.9781569112778,372.8839563964844,297.1069569112778,372.70335639648437,297.2399569112778L372.6002563964844,297.31295691127775L372.05005639648436,297.69925691127776L371.9684563964844,297.7550569112778L371.40105639648436,298.1284569112778L371.36235639648436,298.1542569112778L370.75635639648436,298.52765691127775L370.64885639648435,298.5920569112778L370.04285639648435,298.94835691127776L369.8751563964844,299.03845691127776L369.6344563964844,299.1715569112778L369.4367563964844,299.2788569112778L369.1917563964844,299.40755691127777L368.9897563964844,299.51495691127775L368.7447563964844,299.6393569112778L368.5384563964844,299.7423569112778L368.2848563964844,299.86685691127775L368.0785563964844,299.96555691127776L367.81205639648437,300.09005691127777L367.61005639648437,300.1844569112778L367.33065639648436,300.3089569112778L367.13295639648436,300.3990569112778L366.8320563964844,300.52785691127775L366.64725639648435,300.60935691127776L366.3033563964844,300.7510569112778L366.1529563964844,300.81545691127775L365.6027563964844,301.03435691127777L365.4351563964844,301.09445691127775L365.0311563964844,301.2489569112778L364.83335639648436,301.3175569112778L364.43365639648437,301.46355691127775L364.24455639648437,301.5279569112778C364.0683563964844,301.58805691127776,363.8877563964844,301.6524569112778,363.70295639648435,301.7082569112778L363.6600563964844,301.7082569112778L363.06255639648435,301.8970569112778L362.88205639648436,301.95285691127776L362.45225639648436,302.0816569112778L362.23735639648436,302.14605691127775L361.8074563964844,302.26625691127776L361.6140563964844,302.32205691127774L360.9865563964844,302.4851569112778L360.19135639648437,302.68255691127774L359.93345639648436,302.7426569112778L359.3919563964844,302.8671569112778L359.12975639648437,302.92295691127777L358.44205639648436,303.06455691127775L358.17985639648435,303.11615691127776L357.2686563964844,303.2792569112778L357.2213563964844,303.2792569112778C356.9333563964844,303.3307569112778,356.64115639648435,303.37795691127775,356.3617563964844,303.4208569112778L356.0952563964844,303.45945691127775L355.3860563964844,303.5582569112778L355.1410563964844,303.59255691127777L354.55645639648435,303.66125691127775L354.3243563964844,303.6869569112778L353.50775639648435,303.77285691127776L353.3486563964844,303.77285691127776L352.6910563964844,303.8286569112778L352.3987563964844,303.8286569112778L351.74125639648435,303.85865691127776L351.3930563964844,303.85865691127776L350.9632563964844,303.88015691127777L350.60645639648436,303.88015691127777L350.17665639648436,303.88015691127777L349.8199563964844,303.88015691127777L349.3901563964844,303.88015691127777L347.4903563964844,303.88015691127777L347.0862563964844,303.88015691127777L346.7252563964844,303.88015691127777L346.3255563964844,303.88015691127777L345.96445639648437,303.88015691127777L345.56475639648437,303.85865691127776L345.20795639648435,303.85865691127776L344.77815639648435,303.8286569112778L344.4299563964844,303.8028569112778L344.0001563964844,303.76855691127776L343.6606563964844,303.73845691127775L343.2308563964844,303.6955569112778L342.9041563964844,303.66125691127775L342.4743563964844,303.61405691127777L342.16485639648437,303.57535691127777L341.49005639648436,303.48955691127776L341.39975639648435,303.48955691127776L340.6389563964844,303.37795691127775L340.4025563964844,303.33925691127774L339.8782563964844,303.2534569112778L339.5902563964844,303.20195691127776L339.1303563964844,303.1203569112778L338.8552563964844,303.06455691127775L338.31795639648436,302.9572569112778L338.0300563964844,302.90145691127776L337.49275639648437,302.78125691127775L337.23915639648436,302.7254569112778L336.54715639648435,302.5623569112778L336.4568563964844,302.5623569112778L335.6917563964844,302.3649569112778L335.5155563964844,302.31765691127777L334.75905639648437,302.10305691127775L334.55705639648437,302.04295691127777C334.2648563964844,301.95715691127776,333.9768563964844,301.8712569112778,333.69745639648437,301.7768569112778L333.5384563964844,301.7253569112778C333.2934563964844,301.6481569112778,333.04845639648437,301.56655691127776,332.80775639648436,301.48075691127775L332.6099563964844,301.4120569112778C332.3305563964844,301.31765691127777,332.05125639648435,301.2145569112778,331.7761563964844,301.1115569112778L331.2818563964844,300.85415691127776L331.18735639648435,300.81545691127775L330.7231563964844,300.63085691127776L330.5554563964844,300.55795691127776L330.1256563964844,300.38195691127777L329.9838563964844,300.3218569112778L329.45515639648437,300.08585691127774L329.3477563964844,300.0342569112778L328.91785639648435,299.8368569112778L328.75885639648436,299.75955691127774L328.35915639648437,299.5621569112778L328.23445639648435,299.49775691127775C328.06685639648435,299.41185691127777,327.89925639648436,299.32605691127776,327.73595639648437,299.23595691127775L327.61985639648435,299.1758569112778L327.2330163964844,298.96555691127776L327.0825863964844,298.8796569112778L326.70004639648437,298.66075691127776L326.59258639648436,298.5963569112778L326.1197963964844,298.3130569112778L326.0080363964844,298.2401569112778L325.65128639648435,298.01695691127776L325.5094363964844,297.9224569112778L325.1441063964844,297.6778569112778L325.0538263964844,297.62205691127775L324.62401639648436,297.3130569112778L324.51225639648436,297.23145691127775L324.1898863964844,296.9910569112778L324.0566463964844,296.8966569112778L323.70849639648435,296.6262569112778L323.63973639648435,296.57045691127774L323.2400063964844,296.2442569112778L323.13685639648435,296.1540569112778L322.8445863964844,295.90085691127774L322.72852639648437,295.7935569112778C322.61676639648437,295.6948569112778,322.50500639648436,295.59605691127774,322.3975563964844,295.4930569112778L322.35028639648436,295.45015691127776L321.98922639648436,295.1024569112778L321.8903763964844,295.0037569112778L321.6324963964844,294.7333569112778L321.5293363964844,294.6260569112778C321.42188639648435,294.51445691127776,321.3187363964844,294.40285691127775,321.21558639648435,294.2869569112778L321.21558639648435,294.26125691127777C321.10812639648435,294.14105691127776,321.0006763964844,294.01655691127775,320.8975163964844,293.89215691127777L320.8072463964844,293.7847569112778L320.57943639648437,293.50155691127776C320.5493463964844,293.46285691127775,320.51925639648437,293.4285569112778,320.4934663964844,293.38995691127775C320.39891639648437,293.2697569112778,320.3086463964844,293.1495569112778,320.21837639648436,293.0250569112778L320.1281063964844,280.80079691127776C319.86161639648435,280.43167691127775,319.6166163964844,280.05824691127776,319.3845263964844,279.68052691127775C319.3157663964844,279.5603369112778,319.26416639648437,279.44016691127774,319.1954063964844,279.3242669112778C319.0492563964844,279.0581469112778,318.89882639648437,278.7963269112778,318.76558639648437,278.53021691127776L318.6280363964844,278.2082969112778C318.5076783964844,277.92928691127776,318.3830413964844,277.6460169112778,318.27988839648435,277.3498469112778C318.2541003964844,277.2854569112778,318.2454953964844,277.2167869112778,318.21970739648435,277.1523969112778C317.93436039648435,276.30709691127777,317.7496993964844,275.4311469112778,317.66952769648435,274.5427049112778C317.6437396964844,274.25083591127776,317.6308325464844,273.9546699112778,317.6265563964844,273.68425691127777L317.8070723964844,298.1500569112778C317.81966539648437,299.33715691127776,318.0198303964844,300.5148569112778,318.40022439648436,301.63965691127777C318.40022439648436,301.70405691127775,318.4346173964844,301.77265691127775,318.46040539648436,301.8370569112778C318.5592543964844,302.1203569112778,318.6839163964844,302.4036569112778,318.8085563964844,302.6955569112778C318.85582639648436,302.8028569112778,318.89452639648437,302.9101569112778,318.9417963964844,303.01745691127775C319.0707363964844,303.28355691127774,319.21688639648437,303.5453569112778,319.3716163964844,303.8114569112778C319.4446763964844,303.9273569112778,319.49197639648435,304.04755691127775,319.5650363964844,304.16775691127776C319.68109639648435,304.35665691127775,319.79713639648435,304.54545691127777,319.92179639648435,304.73005691127776C320.0464663964844,304.91455691127777,320.17109639648436,305.10345691127776,320.3086463964844,305.28805691127775C320.39461639648437,305.40825691127776,320.48915639648436,305.5283569112778,320.57943639648437,305.64855691127775L320.6697063964844,305.76015691127776C320.7427663964844,305.85885691127777,320.8201263964844,305.94905691127775,320.8975163964844,306.04345691127776L320.9877963964844,306.15075691127777C321.09094639648436,306.2752569112778,321.1940963964844,306.3997569112778,321.3058563964844,306.52415691127777L321.3273363964844,306.5499569112778L321.6367963964844,306.88905691127775L321.73994639648436,306.99635691127776L322.00212639648436,307.26245691127775L322.1009763964844,307.36115691127776C322.2170363964844,307.48135691127777,322.3373763964844,307.5972569112778,322.4620363964844,307.7131569112778L322.50500639648436,307.75175691127777L322.8359763964844,308.05655691127777L322.9520363964844,308.1595569112778L323.24861639648435,308.41275691127777L323.3517663964844,308.50295691127775L323.75149639648436,308.8334569112778L323.82025639648435,308.88495691127775L324.1684063964844,309.15535691127775L324.2973463964844,309.25405691127776L324.62401639648436,309.4944569112778L324.7357663964844,309.5759569112778L325.1655863964844,309.8807569112778L325.2558563964844,309.94085691127776L325.6211963964844,310.1855569112778L325.76304639648436,310.2756569112778L326.1197963964844,310.50315691127776L326.2315563964844,310.5718569112778C326.38628639648437,310.6705569112778,326.5453163964844,310.76495691127775,326.70434639648437,310.85935691127776L326.8074963964844,310.9194569112778L327.1943463964844,311.1384569112778L327.3447663964844,311.2242569112778L327.7358563964844,311.43885691127775L327.84335639648435,311.4989569112778L328.34625639648436,311.7607569112778L328.47085639648435,311.82085691127776L328.8705563964844,312.01835691127775L329.02965639648437,312.09555691127775L329.45945639648437,312.2973569112778L329.56255639648435,312.3445569112778L330.09555639648437,312.58485691127777L330.2331563964844,312.64495691127775L330.6629563964844,312.8209569112778L330.8305563964844,312.88965691127777L331.2947563964844,313.0784569112778L331.3850563964844,313.1171569112778L331.87935639648435,313.30595691127775L331.92235639648436,313.30595691127775L332.75615639648436,313.60645691127775L332.94955639648435,313.6751569112778L333.68455639648437,313.9197569112778L333.8436563964844,313.97125691127775L334.7032563964844,314.23735691127774L334.9052563964844,314.2974569112778L335.66605639648435,314.50785691127777L335.7820563964844,314.54215691127774L335.84225639648434,314.54215691127774C336.09585639648435,314.6108569112778,336.34945639648436,314.6794569112778,336.60735639648436,314.7396569112778L336.6933563964844,314.7396569112778L337.3853563964844,314.9070569112778L337.6432563964844,314.96285691127775L338.1804563964844,315.07875691127776L338.4641563964844,315.1388569112778L339.0014563964844,315.24615691127775L339.1819563964844,315.2804569112778L339.28085639648435,315.2804569112778L339.74075639648436,315.36635691127776L340.0286563964844,315.4135569112778L340.55305639648435,315.4993569112778L340.78515639648435,315.53805691127775L341.54595639648437,315.64965691127776L341.64905639648435,315.64965691127776L342.31525639648436,315.73975691127777L342.35395639648436,315.73975691127777L342.6247563964844,315.76985691127777L343.0545563964844,315.82135691127775L343.3812563964844,315.8556569112778L343.8110563964844,315.89855691127775L344.15065639648435,315.92435691127775L344.58045639648435,315.9629569112778L344.9242563964844,315.9887569112778L345.35415639648437,316.01445691127776L345.46155639648435,316.01445691127776L345.70655639648436,316.01445691127776L346.11055639648436,316.03595691127776L346.4673563964844,316.03595691127776L346.8713563964844,316.03595691127776L347.2324563964844,316.03595691127776L347.6321563964844,316.03595691127776L349.53625639648436,316.03595691127776L349.96605639648436,316.03595691127776L350.3271563964844,316.03595691127776L350.7569563964844,316.03595691127776L351.1137563964844,316.03595691127776L351.5435563964844,316.01445691127776L351.77565639648435,316.01445691127776L351.8916563964844,316.01445691127776L352.42465639648435,315.9801569112778L352.70835639648436,315.9801569112778L353.37455639648437,315.92435691127775L353.52925639648436,315.92435691127775L354.3459563964844,315.8427569112778L354.5737563964844,315.81705691127775L355.1582563964844,315.74405691127777L355.2442563964844,315.74405691127777L355.4075563964844,315.74405691127777L356.11685639648437,315.64535691127776L356.3832563964844,315.6024569112778L357.2429563964844,315.46505691127777L357.2902563964844,315.46505691127777C357.59535639648436,315.4135569112778,357.8962563964844,315.35775691127776,358.2014563964844,315.2976569112778L358.45925639648436,315.24615691127775C358.69135639648437,315.2032569112778,358.9235563964844,315.1560569112778,359.15125639648437,315.10455691127777L359.3146563964844,315.07015691127776L359.4134563964844,315.07015691127776L359.9550563964844,314.94995691127775L360.2129563964844,314.8898569112778L361.0080563964844,314.69245691127776L361.63565639648436,314.5250569112778L361.82475639648436,314.4735569112778L362.25455639648436,314.3490569112778L362.46945639648436,314.28895691127775L362.8993563964844,314.1601569112778L363.0798563964844,314.10435691127776L363.6772563964844,313.91125691127775L363.7202563964844,313.91125691127775C363.9050563964844,313.85115691127777,364.0855563964844,313.7910569112778,364.2618563964844,313.72665691127776L364.4466563964844,313.6622569112778L364.8506563964844,313.5206569112778L365.0440563964844,313.44765691127776C365.18165639648436,313.3961569112778,365.31915639648435,313.34895691127775,365.45245639648437,313.2931569112778L365.61575639648436,313.2330569112778L366.1702563964844,313.0141569112778L366.29915639648436,312.95835691127775L366.6516563964844,312.8166569112778L366.8364563964844,312.7351569112778L367.13295639648436,312.60635691127777L367.3350563964844,312.51625691127776L367.61005639648437,312.39175691127775L367.81635639648437,312.2973569112778L368.0785563964844,312.1728569112778L368.2848563964844,312.0741569112778L368.5427563964844,311.94965691127777L368.7447563964844,311.84665691127776L368.9940563964844,311.7179569112778L369.1960563964844,311.6149569112778L369.4410563964844,311.48615691127776L369.6387563964844,311.37885691127775L369.8794563964844,311.2457569112778L369.9955563964844,311.18135691127776L370.04285639648435,311.1513569112778L370.6531563964844,310.79935691127775L370.76065639648436,310.7349569112778C370.96265639648436,310.61055691127774,371.16895639648436,310.4860569112778,371.36665639648436,310.3572569112778L371.40105639648436,310.3572569112778C371.59445639648436,310.23275691127776,371.78785639648436,310.1083569112778,371.9727563964844,309.97955691127777L372.05435639648437,309.9237569112778C372.23915639648436,309.7992569112778,372.4240563964844,309.67045691127777,372.6045563964844,309.5374569112778L372.7077563964844,309.46445691127775L373.2320563964844,309.0695569112778L373.3137563964844,309.00945691127777L373.82955639648435,308.5802569112778L374.3280563964844,308.15105691127775L374.4097563964844,308.07805691127777C374.5687563964844,307.9407569112778,374.71925639648435,307.7990569112778,374.8696563964844,307.6488569112778L374.90835639648435,307.61025691127776L374.99865639648436,307.5243569112778C375.04595639648437,307.48145691127775,375.09315639648435,307.4385569112778,375.13615639648435,307.39135691127774L375.2866563964844,307.2453569112778L375.42415639648436,307.1080569112778L375.5660563964844,306.9620569112778L375.6992563964844,306.82475691127775C375.7465563964844,306.7774569112778,375.79375639648435,306.72595691127776,375.83675639648436,306.6744569112778L375.9657563964844,306.53715691127775L376.10325639648437,306.38695691127776L376.2236563964844,306.24955691127775L376.3568563964844,306.09505691127777L376.4729563964844,305.95765691127775L376.6018563964844,305.79885691127777C376.6405563964844,305.7516569112778,376.6792563964844,305.70875691127776,376.7136563964844,305.6615569112778L376.8425563964844,305.50275691127774C376.8760563964844,305.45515691127775,376.9118563964844,305.4092569112778,376.9500563964844,305.3653569112778C376.9480563964844,305.35545691127777,376.9480563964844,305.3452569112778,376.9500563964844,305.33535691127776L376.98445639648435,305.2838569112778C377.0875563964844,305.15505691127777,377.1821563964844,305.02195691127775,377.27675639648436,304.8846569112778L377.3239563964844,304.8202569112778C377.4271563964844,304.6742569112778,377.5216563964844,304.5326569112778,377.6205563964844,304.39105691127776C377.6380563964844,304.3580569112778,377.6581563964844,304.3264569112778,377.68075639648436,304.2965569112778L377.95585639648436,303.8673569112778C377.9550563964844,303.85735691127775,377.9550563964844,303.84735691127776,377.95585639648436,303.83735691127777C378.0417563964844,303.69135691127775,378.12345639648436,303.54975691127777,378.20085639648437,303.40805691127775L378.2309563964844,303.3565569112778C378.2301563964844,303.34375691127775,378.2301563964844,303.33085691127775,378.2309563964844,303.31795691127775C378.29965639648435,303.1805569112778,378.37275639648436,303.04755691127775,378.4372563964844,302.88875691127777L378.4716563964844,302.8200569112778C378.52745639648435,302.7041569112778,378.58335639648436,302.58395691127777,378.63495639648437,302.46805691127776C378.65245639648435,302.43315691127776,378.66825639648437,302.39735691127777,378.6822563964844,302.36075691127775C378.74235639648435,302.21915691127776,378.80255639648436,302.08175691127775,378.85845639648437,301.93155691127777Q378.85845639648437,301.93155691127777,378.85845639648437,301.9058569112778C378.9100563964844,301.7727569112778,378.96155639648435,301.64395691127777,379.00455639648436,301.5109569112778C379.00705639648436,301.49245691127777,379.00705639648436,301.47365691127777,379.00455639648436,301.45515691127775Q379.00455639648436,301.41645691127775,379.00455639648436,301.3950569112778C379.04325639648437,301.28345691127777,379.0776563964844,301.17185691127776,379.1120563964844,301.06025691127775L379.1378563964844,300.98725691127777C379.18075639648436,300.8542569112778,379.21515639648436,300.7168569112778,379.25385639648437,300.58375691127776L379.27965639648437,300.48075691127775L379.3570563964844,300.1631569112778L379.3828563964844,300.04725691127777C379.4129563964844,299.9099569112778,379.43865639648436,299.7768569112778,379.46445639648437,299.63945691127776Q379.46445639648437,299.6180569112778,379.46445639648437,299.6094569112778C379.46445639648437,299.4849569112778,379.5074563964844,299.36045691127777,379.5246563964844,299.2360569112778L379.5246563964844,299.1158569112778C379.5246563964844,299.00855691127776,379.5504563964844,298.90555691127776,379.5633563964844,298.79825691127775C379.5633563964844,298.7638569112778,379.5633563964844,298.72955691127777,379.5633563964844,298.69945691127776C379.5633563964844,298.5621569112778,379.5848563964844,298.42475691127777,379.5934563964844,298.2917569112778C379.59135639648434,298.26175691127776,379.59135639648434,298.23165691127775,379.5934563964844,298.20155691127775C379.5934563964844,298.0942569112778,379.5934563964844,297.9826569112778,379.5934563964844,297.8753569112778L379.5934563964844,297.65215691127776L379.6493563964844,285.4020569112778Z" fill="url(#master_svgi_3_5420)" fill-opacity="1"/></g><g><path d="M377.17786889648437,278.3627793917465C383.86586889648436,287.5567493917465,376.5847688964844,298.60074939174655,360.9608688964844,302.62254939174653C345.3369688964844,306.6443493917465,326.88486889648436,302.19334939174655,320.1968688964844,293.0121493917465L348.68946889648436,285.6896493917465L367.26626889648435,270.9715493917465C371.61606889648436,272.8773093917465,375.0373688964844,275.42259939174653,377.17786889648437,278.3627793917465Z" fill="#2564F4" fill-opacity="1"/></g></g></g></g></g><g clip-path="url(#master_svgj_3_6303/3_5408)"></g><g><path d="M451.89999,285.85L466.65,285.85L466.65,289.45L451.89999,289.45L451.89999,285.85ZM487.35,280.45Q486.8,280.5,486.175,280.575Q485.55,280.65,484.85,280.8L484.15,277.3Q485,277,485.375,276.75Q485.75,276.5,486.15,276.05Q486.9,275.25,487.95,273.725Q489,272.2,490.15,270.325Q491.3,268.45,492.425,266.4Q493.55,264.35,494.45,262.45L497.65,264.2Q496.8,265.9,495.8,267.75Q494.8,269.6,493.75,271.3Q492.7,273,491.7,274.475Q490.7,275.949999,489.9,276.9Q490.45,276.9,491.35,276.85Q492.25,276.8,493.25,276.75Q494.25,276.7,495.275,276.65Q496.3,276.6,497.05,276.55Q497.9,275.25,498.7,273.95Q499.5,272.65,500.2,271.45L503.2,273.4Q502.4,274.85,501.275,276.725Q500.15,278.6,498.75,280.65Q497.35,282.7,495.775,284.875Q494.2,287.05,492.5,289.1Q493.25,289,494.625,288.8Q496,288.6,497.5,288.4Q499,288.2,500.275,288.025Q501.55,287.85,502.1,287.75L502.2,291.45Q501.85,291.5,500.925,291.6Q500,291.7,498.8,291.85Q497.6,292,496.25,292.175Q494.9,292.35,493.65,292.525Q492.4,292.7,491.425,292.85Q490.45,293,490,293.1Q488.85,293.25,487.875,293.425Q486.9,293.6,486.2,293.75L485.45,290.15Q486.65,289.75,487.35,289.375Q488.05,289,488.75,288.2Q489.9,286.9,491.475,284.725Q493.05,282.55,494.8,280Q493.85,280.05,492.7,280.1Q491.55,280.15,490.5,280.225Q489.45,280.3,488.575,280.35Q487.7,280.4,487.35,280.45ZM528.3,301.4L528.3,305.1L500.9,305.1L500.9,301.4L512.45,301.4L512.45,271.05L502.9,271.05L502.9,267.25L526.35,267.25L526.35,271.05L516.25,271.05L516.25,301.4L528.3,301.4ZM502.3,300.8Q500.65,301.25,498.2,301.825Q495.75,302.4,493.15,302.925Q490.55,303.45,488.1,303.9Q485.65,304.35,484,304.55L483.5,300.8Q485.2,300.6,487.675,300.15Q490.15,299.7,492.775,299.15Q495.4,298.6,497.875,298.025Q500.35,297.45,502.05,296.95L502.2,298.8L502.3,300.8ZM584.6,271.55L584.6,307.6L580.8,307.6L580.8,304.5L547.7,304.5L547.7,271.3L551.5,271.55L551.5,300.7L564.25,300.7L564.25,263.4L568.05,263.65L568.05,300.7L580.8,300.7L580.8,271.3L584.6,271.55ZM648.35,287.6L637.15,287.6L637.15,307.9L633.15,307.9L633.15,287.6L619.7,287.6Q619.5,291.3,618.875,294.1Q618.25,296.9,616.975,299.3Q615.7,301.7,613.7,303.95Q611.7,306.2,608.75,308.8L605.9,306Q608.65,303.65,610.475,301.65Q612.3,299.65,613.425,297.575Q614.55,295.5,615.1,293.1Q615.65,290.7,615.8,287.6L604.1,287.6L604.1,283.95L615.9,283.95L615.9,282.8L615.9,269.9L606.7,269.9L606.7,266.25L645.7,266.25L645.7,269.9L637.15,269.9L637.15,283.95L648.35,283.95L648.35,287.6ZM633.15,283.95L633.15,269.9L619.85,269.9L619.85,282.4L619.85,283.95L633.15,283.95ZM674.3,273.95Q673.55,273.2,672.475,272.2Q671.4,271.2,670.225,270.225Q669.05,269.25,667.95,268.375Q666.85,267.5,666.1,267L668.15,264.35Q669,264.9,670.125,265.7Q671.25,266.5,672.4,267.425Q673.55,268.35,674.625,269.25Q675.7,270.15,676.45,270.9L674.3,273.95ZM681.3,281.9Q681.3,286.45,681,289.975Q680.7,293.5,680.025,296.525Q679.35,299.55,678.225,302.375Q677.1,305.2,675.45,308.35L672.1,306.75Q673.75,303.65,674.825,300.95Q675.9,298.25,676.525,295.425Q677.15,292.6,677.425,289.4Q677.7,286.2,677.7,282.05L677.7,265.65L708.7,265.65L708.7,269L681.3,269L681.3,281.9ZM697.05,292.35L697.05,301.85Q697.05,303.35,696.825,304.3Q696.6,305.25,696,305.825Q695.4,306.4,694.4,306.675Q693.4,306.95,691.9,307.15L688.85,307.55L687.65,304.05L690.65,303.8Q691.6,303.75,692.175,303.575Q692.75,303.4,693.05,303.05Q693.35,302.7,693.45,302.075Q693.55,301.45,693.55,300.45L693.55,292.35L685.2,292.35L685.2,274.6L692.05,274.6Q692.45,273.35,692.825,272.125Q693.2,270.9,693.45,269.6L696.95,270.2Q696.7,271.2,696.375,272.35Q696.05,273.5,695.7,274.6L705.35,274.6L705.35,292.35L697.05,292.35ZM672.75,285.1Q671.9,284.2,670.75,283.175Q669.6,282.15,668.4,281.15Q667.2,280.15,666.05,279.275Q664.9,278.4,664,277.85L666,275.15Q666.95,275.75,668.125,276.575Q669.3,277.4,670.5,278.35Q671.7,279.3,672.825,280.225Q673.95,281.15,674.8,281.95L672.75,285.1ZM688.6,277.65L688.6,281.8L702,281.8L702,277.65L688.6,277.65ZM688.6,289.3L702,289.3L702,284.85L688.6,284.85L688.6,289.3ZM673.55,289.3Q673.1,291.1,672.55,293.325Q672,295.55,671.375,297.925Q670.75,300.3,670.025,302.75Q669.3,305.2,668.5,307.45L665.1,306.4Q666.7,302.05,668.025,297.225Q669.35,292.4,670.2,288.35L671.9,288.85L673.55,289.3ZM702.25,294.6Q703.2,295.55,704.3,296.775Q705.4,298,706.45,299.3Q707.5,300.6,708.475,301.875Q709.45,303.15,710.2,304.2L707.65,306.5Q706.9,305.3,705.925,303.9Q704.95,302.5,703.925,301.15Q702.9,299.8,701.875,298.55Q700.85,297.3,699.9,296.35L702.25,294.6ZM689.7,296.4Q688.9,297.65,687.95,299.05Q687,300.45,685.95,301.8Q684.9,303.15,683.8,304.4Q682.7,305.65,681.65,306.65L679.25,304.45Q681.4,302.5,683.45,299.925Q685.5,297.35,687.1,294.7L689.7,296.4ZM768.85,297.4Q768.45,299.35,768.025,300.925Q767.6,302.5,766.95,304.1Q766.5,305.2,766,305.85Q765.5,306.5,764.925,306.875Q764.35,307.25,763.65,307.375Q762.95,307.5,762.15,307.5Q760.4,307.5,758.7,306.225Q757,304.95,755.15,301.8Q754.75,301.15,754.4,300.475Q754.05,299.8,753.75,299Q752,300.85,749.975,302.7Q747.95,304.55,745.4,306.45L742.9,303.75Q748.65,299.55,752.3,295.3Q751,291.25,750.05,285.9Q749.1,280.55,748.45,273.8L732.95,273.8L732.95,281L745.2,281Q745.2,281.45,745.15,282.625Q745.1,283.8,745.05,285.325Q745,286.85,744.925,288.575Q744.85,290.3,744.775,291.85Q744.7,293.4,744.625,294.6Q744.55,295.8,744.5,296.3Q744.35,298.05,744.025,299.175Q743.7,300.3,743.025,301.025Q742.35,301.75,741.175,302.15Q740,302.55,738.15,302.75L735.35,303.05L734.3,299.35L737.6,299.05Q738.65,298.95,739.275,298.775Q739.9,298.6,740.225,298.2Q740.55,297.8,740.7,297.125Q740.85,296.45,740.95,295.3Q741,294.7,741.1,293.125Q741.2,291.55,741.275,289.8Q741.35,288.05,741.4,286.525Q741.45,285,741.45,284.55L732.95,284.55Q732.9,288.6,732.55,291.825Q732.2,295.05,731.5,297.825Q730.8,300.6,729.725,303.125Q728.65,305.65,727.15,308.35L723.45,306.55Q725.15,303.95,726.3,301.6Q727.45,299.25,728.15,296.625Q728.85,294,729.175,290.8Q729.5,287.6,729.5,283.3L729.5,270.35L748.15,270.35Q748.05,269.05,747.95,267.75Q747.85,266.45,747.75,265.3Q747.65,264,747.55,262.75L751.25,262.75L751.8,270.35L760.15,270.35Q759.55,269.65,758.825,268.825Q758.1,268,757.375,267.25Q756.65,266.5,755.975,265.825Q755.3,265.15,754.85,264.75L757.1,262.4Q757.7,262.9,758.55,263.65Q759.4,264.4,760.25,265.225Q761.1,266.05,761.875,266.85Q762.65,267.65,763.1,268.25L761.1,270.35L767.25,270.35L767.25,273.8L752.1,273.8Q752.6,279.25,753.3,283.75Q754,288.25,755,291.85Q757.2,288.65,758.75,285.15Q760.3,281.65,761.65,277.45L765.05,278.65Q763.2,283.85,761.225,288.025Q759.25,292.2,756.35,295.95Q756.85,297.25,757.4,298.375Q757.95,299.5,758.55,300.5Q759.6,302.2,760.45,302.85Q761.3,303.5,761.95,303.5Q762.95,303.5,763.45,302.925Q763.95,302.35,764.4,301.05Q764.85,299.75,765.1,298.45Q765.35,297.15,765.6,295.55L768.85,297.4ZM810.65,292.3Q814.2,295.75,818.775,298.4Q823.35,301.05,829.6,302.9L827.75,306.35Q824.45,305.2,821.7,303.875Q818.95,302.55,816.65,301.05Q814.35,299.55,812.425,297.95Q810.5,296.35,808.8,294.65L808.8,308.05L805.2,308.05L805.2,294.65Q801.9,298.1,797.05,301.225Q792.2,304.35,786.2,306.5L784.25,303.15Q790.15,301.2,794.925,298.4Q799.7,295.6,803.15,292.3L786.35,292.3L786.35,288.95L805.2,288.95L805.2,284.6L790.6,284.6L790.6,265.55L823.25,265.55L823.25,284.6L808.8,284.6L808.8,288.95L827.5,288.95L827.5,292.3L810.65,292.3ZM794.15,268.8L794.15,273.5L805.2,273.5L805.2,268.8L794.15,268.8ZM819.65,268.8L808.8,268.8L808.8,273.5L819.65,273.5L819.65,268.8ZM805.2,281.3L805.2,276.6L794.15,276.6L794.15,281.3L805.2,281.3ZM819.65,281.3L819.65,276.6L808.8,276.6L808.8,281.3L819.65,281.3ZM888.7,271.35L853.75,271.35L853.75,283.3Q853.75,288,853.45,291.4Q853.15,294.8,852.425,297.6Q851.7,300.4,850.575,302.925Q849.45,305.45,847.8,308.4L844.3,306.7Q845.95,303.7,847.1,301.225Q848.25,298.75,848.925,296.15Q849.6,293.55,849.9,290.575Q850.2,287.6,850.2,283.65L850.2,268.1L868,268.1Q867.6,266.75,867.125,265.325Q866.65,263.9,866.3,263L870,262.3Q870.2,262.75,870.475,263.475Q870.75,264.2,871,264.975Q871.25,265.75,871.525,266.575Q871.8,267.4,872,268.1L888.7,268.1L888.7,271.35ZM889.3,300.4L874.55,300.4L874.55,308L870.85,308L870.85,300.4L854.7,300.4L854.7,297L870.85,297L870.85,291.65L858.35,291.65L858.35,288.35Q859.45,286.65,860.6,284.625Q861.75,282.6,862.9,280.45L855.75,280.45L855.75,277.05L864.6,277.05Q865.3,275.6,865.925,274.25Q866.55,272.9,867.05,271.65L870.65,272.6Q870.2,273.65,869.675,274.775Q869.15,275.9,868.6,277.05L886.95,277.05L886.95,280.45L866.9,280.45Q865.75,282.6,864.625,284.625Q863.5,286.65,862.45,288.35L870.85,288.35L870.85,282.4L874.55,282.5L874.55,288.35L885.95,288.35L885.95,291.65L874.55,291.65L874.55,297L889.3,297L889.3,300.4ZM906.3,285.85L921.05,285.85L921.05,289.45L906.3,289.45L906.3,285.85Z" fill="#091982" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/military/achievement/image/left_bot_icon.png b/src/military/achievement/image/left_bot_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..45a5d4045d96c0fa92442de9006e170eeadd7e2e
GIT binary patch
literal 1766
zcmV<C1{wK@P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS000J^Nkl<ZcwX(CU2GIp6oAj2T}%H9y6xI-g$Dr>O<PG+P>Mkxv?O9MQhiV(
z1QJOk*2mJ~6KTOWFq%N55fgo}7=LOa5+4kdSbq|vMxzLZYFpi(0xbgDc6N{FY&+X_
z*xlK=GrR3>=O&wMcJJJK&o}39?wxxDm?%R*^=XVkvk-V6fbbxKM+hh~(M0yEBHW-(
zLm)7OD1H?ReB`Ti_oO=zVN~(zRa|y`Tx|m(c2V6@qx!k<KLU&j#CJ=UxI33F6<1P?
zIVm7SEEoz!cLU;Hs<bQ@1UEZI0(FIM{63#Yc}EB_k?8t_fPz6R8;?dlCG&aQY^OO{
zAK|kC#r0BUrMRXa|1E$9gSc9t`Z@WSdva1(=|SUfAlzGgmE!l=P0Rr_IEHsXSp8Oj
zSS8(0PG5-UMWK6rO}PkZV#EQF&v6e2)Kg@W59hRumIse#YAW3u$tS7YR2<N7AkvC}
z`z^Ph2Mv$~?Ww799f$)O9zzd?BY)BlWqBZ<9U_b=MXr_AWg-~Uph3TSm?G9IcC?%?
zZBP<?q}J=+B}PWD{H7WS5}<;75zY=d2+(+u+f^loL+TcKeE7tUM)R!=dMtTHIOdi7
zwz8QKpvgW8X>0TC?%N>`r9R(@A-{Twg8d3R8qB*k5C+)9!sMWr<ehLf2*i$B3<Xqr
zsC7y*0uCSp-EaUofULO>M}u-fgD&_5TptIxMjtL^6jMv+v(h{N@nc>zh=F|B4{+`;
z0sK8xVMq<j5jNG&53sBO`Y#M{{6_`4zb9>>?=t1i3V@~tgsl%mp|nt@1@qTr9FQGg
z^kS6|oaTqJ11h6{PM;TW;0r}sV~p-MgKB*$3L92u&R1mw&_AOLM!>lN!*xj`25J4@
zumTAbLUo1xplk>96FJ`Y<C)W%WW-pTI<`jPesbt`7Fz)w>s8>`DS55AyJ||fivjsI
zwmpiltubmFBijJ6uQ}0gUa)$)<Lq$teuVuON4$R0NVBD>o=wgkNR|O{lxqK2k@7d}
zH=62G3v!}giTN|Lh5b^;v)0oAOMn>8>mMqH$zCGi(t)F0Cku&_%!4mjgCq^e3LG}8
zw_cpl94%KmJ1~W04b5-rlfl<MP^8SwDkNz@JG<mGhXL%PXruX@WT5qeu}^w~qN7Y<
zb2~(uBvYgS$vR|hfZw!5;$wY}qTc%y{SuXzDH?63sHByRoh}&}W7o(!ZqtDH;gYpS
zws0u#+BtJKQ<;w56n7j|ETsTPcSKFk5M&(?n+^|DD`o&$F>CHGD}cD8{XGhN^|SfV
zJD(=@WF5ku&F1}(X${hZw4&~MC*493N}oNmDITIor%h{EangEIHRB$n0de$6Bv?9~
z>!S*{#aZ*&>8yFpbap*^&ZmX)Et!X3J?M1CH@l8BAa2A8q--RLR^hOWmH=sx+9*Gf
zd1gunl57^uX4OggmerX@%YZa>ly%%}Zv3#?xN7b+MeiR|534d}CF_tAnV)Tdxbaj;
zUplt0tzsBW<fm#&pIoNXZ>l=B0^*K%!mO=Zfg96HI93Ok?)AmAOw`%Dz$eT!VR*{*
z?UMq|keOtotS9s29LK7^$+(H>JK)@feN(2i$y*Mv`-vQ!w4V)1%W=AYun!cQQ}ctg
zFN>UeCbY)3JjjgsXrMT3`^U^&Ia8N4rg<&RLe^!*oU(3W$uMw~I!#+fddUQhCg?fY
zYov9r4YajpKGy1Ok76>q!A{*jN-r-=FG-it5{{RanKQA@Wp;cE0+883XS2Qo$bhy3
z$N^-{ARP@d(jezW^5lf3UL<$6BBUS`+lt_9W=TdUwwcA*4wcfxjyN0YQaEV=xJlcR
z8E|&|%q2w*dcs%bDs?vXCefhyre6Nv??>+>L@tpQW$Eo>Ysp)tuO>KQSFvk(d|Nno
zI2f2bNE_-~GTnJ@w2yE4s%~rLvBoEjr%rrPdujhFz4X6$3x)PRUzPhY;t-pBnKP>%
z3ZX9?jr7rvwTlrEt;}73Lf5+5axtRGf6KDNzn8HtqDFeD0!?r(qJj`|gKM4FD=yBK
zI^nv^-=lcD5>|WYB$!7Q1tNs6qlK>L@2U`&_41}VqDvVLMz#aJO-qL8%}Y=S0Xkh_
zZ?(tOMLs9t%R`1Md+fX?P;Do7^(sNipF`dN4;Kh`N1|i73{5PVw$L$wo9Ud7=jfQg
zdjW-q>Ul`JiWjnWQBHG{@;f?FDt1iZFQhTubW9)}L6%<m9|6NV*!GRT>;M1&07*qo
IM6N<$f`n%@R{#J2

literal 0
HcmV?d00001

diff --git a/src/military/achievement/image/left_top_icon.png b/src/military/achievement/image/left_top_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1df7cd38147274d5db4a61a33e1fb0b9ede4a172
GIT binary patch
literal 1965
zcmV;e2U7TnP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS000MMNkl<ZcwX&XOHdS76g~Z!8NQ<q9~ChCR0cmp@I%(oY+|KKNQF(x&)y_!
zj2kv8do}B*l?@BQs+goIB&@}XMhP&4-=Kk50)7}7=GWbMZ^l8!nWkUQba#MZcF_0T
zckk)@?!E85zL$fZ-(Xh(f(|DH&H+&o5P<+*;PtSuoK}`(h>*bBBUlQB;0P{Yf7=^Y
zIXF#1Md9(dyBH9*t$8psm3d1bauPzpS7>ON1INj$4O<N$4uijJLs%+?K&)jW{v-mF
zZE=oR)JvkCl1jzY0CjZm_@b!-GM~Q@aY@oi=6&eypFu}Qk~Jj*G}vW_lve=`j;sJD
zuB3t>1phz8nnEk}P6Vi{OF+G?3b5I;3Y?W7dHhpoYm?&tN(5-=ZY3loFDt=`D=lz-
z>^nJ?4AAiHB1G(^Sq)BHc`@`H^{w;t&zJ?#rFAgB7Lg4at@OTing+NR$HBEpF@Of|
z?trXp)5~W=)AQU*>_7R8gF-_3z~Q|lVbV?-H#8#eDQ6R8)ZH5;$zWdr<i%atq&u^&
zeEw4c(B|?|1&k~+4iCGlAlh=7QOzd8NO+0EA9r@cF4!#9JMg*?^UsgMA2<$0Du*mP
z$xg_<EQ7%JL*aa|iTx;W-bd*!kEQa(Cksho4xXRu$cEIKBa0dDG5B7ehAbV|r!Y4S
zhy5nXDteH!#iws<2Gqn+a~SxsJ_8nPL!Uo&<JEjSB>5QI097g<9FA+K*?%iTKFq_-
z2WWigJVJr<%o4E>(k19By@=wnX%_NKXv_nM`k5*3W&O*ESsfpWO3s??pUeYj<k3|V
z!HJ`2I!NXKG&*nzk#GyMEo4UMLv`&5vz)i_0C~rbV`<@PW;*K}O?}edL+5mkVj?#d
zAnJD}$9u`lg-o*>NtBa!5!LQ)BUw^j#sW0{7l~LQ_J}2jJtPtAA-U0c;;)WImE%Z)
z=*aB^<U$03XUJK48Jp51SE_IPgpHP+%2<GgAKYWI9twi1I57gzrKv=m*txTJ*`H90
zd@^+bQsfkqN+wv5aRBM@J$Czb)E>Cbq%_UGU%&XCiI!UA-iB|PXc>u&188jE0>a_b
zO!IR5?{FXbiiuVaK!6YRP0dVv8HtPoXynn2Wj~@dc}`9zs`uU0B8xtsn<>ZavtOBL
zDN#{LtC7j0aR7N9+)mh$t7(*K8N{4B^)uz*#a@(EUPR%FP3fek1;M3uD2jG;+~PWi
zvZ{V&Ks5-B18Dfckfu<n-fpVM$8*D|Yy3QcA9dK?$tzIgk5`>%-2%i5_fhxZ*(BvW
zB=RXK@+Rljvna2*pFq!&Mi?B)jI$suAEXA5n&qVn(3-U%Er6hs$f<2=D{7k){17!I
zmPol~oivN^bk9_<^}7To>Lb2odh!PGEwLk4j)dx*{41!c>sel2)c-tv(yqAyrU|IK
zagBy~J&9tfWiUMv+iKYJrcttECc*cxMo2yRm1abV5g6x#D7WE<WTVQkchZyb>PZxH
zonNDB_iv24Gm#k!5KEMyV%coBu>0T@CJC7V;%3NZ^#l`79Yn?g6wOs8dNmU|J?A%*
zLuU{Ov}@{Qg7p}`#3)BrUqmjP;B<9H9X8FB1AYoZA-Tlt#;y-K@n+G9moH8u5+X+)
z8b1?!PkcsWEhx@aGvsS&tm8S2T*cd4&AQ<*2O!p^rUM66QiC(+_vbMOAUX@ZES#Uc
zZ3G6YJoH4vGzBpaASw{6gH20#ZUogeXUw|IFxLmIRM_+9HO(EkUVu#YJ1fO8*MjIw
z(VLD5a@)X=K(Yd5Qb<oVz4-ve{n3j#vfpAj@X`WFPm-y{i{ZI707d;#G}pPrAk!)&
z#P8HMT6JR^mBTuK=xl#KzRY}ulN4`BzEf3W+7+|fTd@`(Dh1tJrSr4fr_D+RR};rt
zfV?B85LjZn1Wd9ZegSn2-=u?WCS$Axh;_H0S|hSsZ!&zht_7a80BK3H2A^9CP$ro*
zM~-XV=6vF^c6?AKON`?^1fW){jm%mLq6hQ~b9HGcY0sZYI;&2Lk-kCJ0yH{6Zzi-4
zz*6d<ETI1INBY#uoZ8wC$^Z4b;eVs^Bl5RO@}%&V^@E4Zafxw=en|d*lp+|VfZ2Sa
zr3jnFEb1^vi&-|yq0|A2mP2h8)Tsj`+n&TqGDn*CSXS|4w%;&{zoIB;_-tges8<cp
z<)U6n(AOct)m#hSqPj7o-m+PIWKz)E;2V2a7EUJ`xU-$Kz;T&1=epvX!_Q&Qr?XV%
zcctL8<4a3ZC3rq(T`6O<uq3qO(5Wf%#ecM2PGYTmU!RE5g(}Dv*RUF`WZL|~Aq<DT
z>dj3k<I$fSq(wz#*0re+lnDGgy*P3tyb|Bk-4<vsj|2G?S<?w7C@*3nFul@p;vlWw
zj^bhWRzNI)$cbrN?OGm4ttJ?mMPth=H8HjObx`O1<*_38!>$e0<V_^aOMd8|Pt}%7
zdx@#R8E+GqYqvuViR-FOV1%^1k(8j`Hi7>EFD3KNUip5)00000NkvXXu0mjf(lo76

literal 0
HcmV?d00001

diff --git a/src/military/achievement/noticeList/index.jsx b/src/military/achievement/noticeList/index.jsx
index e094ad4cc..6d298658a 100644
--- a/src/military/achievement/noticeList/index.jsx
+++ b/src/military/achievement/noticeList/index.jsx
@@ -5,7 +5,6 @@ import ItemList from '../components/itemList';
 import { achieveSource } from '../static';
 import Nodata from '../../../forge/Nodata';
 import Loading from "../../../Loading";
-import noticePng from '../image/banner.png';
 import { getNoticeList } from '../api';
 
 import './index.scss';
@@ -201,7 +200,6 @@ export default (props) => {
 
   return (
     <React.Fragment>
-      <img alt="图片加载失败" src={noticePng} width="100%"></img>
       <div className="centerbox notice-list clearfix">
         <div className="body">
         <Affix className="affix-list-left" offsetTop={90}>
diff --git a/src/military/achievement/overview/index.jsx b/src/military/achievement/overview/index.jsx
index e094ad4cc..27c8ccee1 100644
--- a/src/military/achievement/overview/index.jsx
+++ b/src/military/achievement/overview/index.jsx
@@ -1,227 +1,47 @@
 import React, { useEffect, useState } from 'react';
-import classNames from 'classnames';
-import { Pagination, Icon, Input, Affix, } from 'antd';
-import ItemList from '../components/itemList';
-import { achieveSource } from '../static';
-import Nodata from '../../../forge/Nodata';
-import Loading from "../../../Loading";
-import noticePng from '../image/banner.png';
-import { getNoticeList } from '../api';
-
+import noticePng from '../image/banner_new.svg';
 import './index.scss';
-const Search = Input.Search;
+import AchivChart from '../achivChart';
+import NoticeList from '../noticeList';
 
 export default (props) => {
+  //记得打开，关闭调试
+  const [showChart, setShowChart] = useState(true);
+  const [showList1, setShowList1] = useState(false);
+  const [selectedButton, setSelectedButton] = useState('chart');
 
-  const [tab, setTab] = useState('0');
-  const [loading, setLoading] = useState(false);
-
-  const [title, setTitle] = useState(undefined);
-  const [orderBy, setOrderBy] = useState('publishDateDesc');
-
-  const [curPage, setCurPage] = useState(1);
-  const [total, setTotal] = useState(0);
-  const [noticeList, setNoticeList] = useState([]);
-
-  const [callList, setCallList] = useState([]);
-  const [changeList, setChangeList] = useState([]);
-  const [checkList, setCheckList] = useState([]);
-  const [abandonList, setAbandonList] = useState([]);
-  const [competitionList, setCompetitionList] = useState([]);
-  const [dealList, setDealList] = useState([]);
-
-  useEffect(() => {
-    setLoading(true);
-    if (tab === '0' || tab === '7') {
-      const params = {
-        orderBy,
-        curPage: 1,
-        isChecked: 1,
-        pageSize: 5,
-        status: 1,
-        type: 7,
-        title,
-        flag: 1,   //后台管理查询：2；前台展示：1
-      };
-      getNoticeList({ ...params,achievementSource:'开源项目' }).then(data => {
-        setCallList(data.rows);
-        setLoading(false);
-      });
-      getNoticeList({...params,achievementSource:'创客任务'}).then(data => {
-        setChangeList(data.rows);
-      });
-      getNoticeList({ ...params,achievementSource:'开放竞赛' }).then(data => {
-        setCompetitionList(data.rows);
-      });
-      getNoticeList({ ...params,achievementSource:'科研成果' }).then(data => {
-        setCheckList(data.rows);
-      });
-      getNoticeList({ ...params,achievementSource:'其他' }).then(data => {
-        setAbandonList(data.rows);
-        setLoading(false);
-      });
+  const handleButtonClick = (button) => {
+    setSelectedButton(button);
+    if (button === 'chart') {
+      showChartComponent();
     } else {
-      const params = {
-        orderBy,
-        curPage,
-        isChecked: 1,
-        pageSize: 10,
-        status: 1,
-        title,
-        type: 7,
-        achievementSource:tab,
-        flag: 1,   //后台管理查询：2；前台展示：1
-      };
-      getNoticeList(params).then(data => {
-        setNoticeList(data.rows);
-        setTotal(data.total);
-        setLoading(false);
-      })
+      showListComponent();
     }
-  }, [tab, title, orderBy, curPage]);
+  };
 
-  function changeSort(sortType) {
-    setOrderBy(sortType);
-    setCurPage(1);
-  }
+  const showChartComponent = () => {
+    setShowChart(true);
+    setShowList1(false);
+  };
 
-  function noticeClick(id) {
-    props.history.push(`/achievement/noticeDetail/${id}`);
-  }
-
-  function sortNav() {
-    return <div className="notice-sort-nav">
-      <Search
-        size="large"
-        maxLength={20}
-        style={{ width: "56%" }}
-        placeholder="输入标题关键字，不能超过20字符"
-        enterButton={<span><Icon type="search" className="mr5" /> 搜索</span>}
-        onSearch={(value) => setTitle(value)} />
-      <div className="center-right-but">
-        <div className={classNames({ sortLink: true, active: orderBy === 'publishDateDesc' })} onClick={() => { changeSort('publishDateDesc') }}>时间降序<Icon type="arrow-down" /></div>
-        <span className="piece">|</span>
-        <div className={classNames({ sortLink: true, active: orderBy === 'publishDateAsc' })} onClick={() => { changeSort('publishDateAsc') }}>时间升序<Icon type="arrow-up" /></div>
-      </div>
-    </div>
-  }
-
-  function handleClick(e) {
-    setTab(e.key);
-    setCurPage(1);
-    setTitle('');
-    setOrderBy('publishDateDesc');
-  }
-
-  function click(e){
-    setTab(e);
-    setCurPage(1);
-    setTitle('');
-    setOrderBy('publishDateDesc');
-  }
-
-  function cont(param, titleStr, key, svgStr) {
-    return <React.Fragment>
-      <div className="item-head-title">
-        <div className="item-head-title-content">
-          <i className={svgStr}></i>
-          <span>{titleStr}</span>
-        </div>
-        {param.length === 5 && <span className="link" onClick={() => { handleClick({ key: key }) }}>查看更多 <Icon type="arrow-right" /></span>}
-      </div>
-      {param.length > 0 ? <ItemList
-        list={param}
-        itemClick={noticeClick}
-      /> : <Nodata _html="暂无数据" />}
-    </React.Fragment>
-  }
-
-  // 成果库具体jsx渲染函数
-  function content() {
-    if (tab === '0') {
-      if(callList.length === 0 && changeList.length === 0 && competitionList.length === 0 && checkList.length === 0 && abandonList.length === 0){
-        return <React.Fragment><Nodata _html="暂无数据" /></React.Fragment>
-      }else{
-        return <React.Fragment>
-          {cont(callList, "开源项目", '开源项目', "iconfont icon-zhaobiaogonggao")}
-          {cont(changeList, "创客任务", '创客任务', "iconfont icon-gengzhenggonggao")}
-          {cont(competitionList, "开放竞赛", '开放竞赛', "iconfont icon-chengjiaogonggao")}
-          {cont(checkList, "科研成果", '科研成果', "iconfont icon-zhongbiaogonggao")}
-          {cont(abandonList, "其他", '其他', "iconfont icon-feibiaogonggao")}
-        </React.Fragment>
-      }
-    } else {
-      let titleStr;
-      let svgStr;
-      switch (tab) {
-        case '开源项目':
-          titleStr = "开源项目";
-          svgStr = "iconfont icon-gengzhenggonggao"
-          break;
-        case '创客任务':
-          titleStr = "创客任务";
-          svgStr = "iconfont icon-zhongbiaogonggao"
-          break;
-        case '开放竞赛':
-          titleStr = "开放竞赛";
-          svgStr = "iconfont icon-chengjiaogonggao"
-          break;
-        case '科研成果':
-          titleStr = "科研成果";
-          svgStr = "iconfont icon-feibiaogonggao"
-          break;
-        case '其他':
-          titleStr = "其他";
-          svgStr = "iconfont icon-zhaobiaogonggao"
-          break;
-      }
-      return <React.Fragment>
-        <div className="item-head-title">
-          <div className="item-head-title-content">
-            <i className={svgStr}></i>
-            <span>{titleStr}</span>
-          </div>
-        </div>
-        <ItemList
-          list={noticeList}
-          itemClick={noticeClick}
-        />
-        {total > 0 ? total> 10 ? <div className="edu-txt-center mt30 mb30">
-          <Pagination
-            showQuickJumper
-            onChange={(page) => { setCurPage(page) }}
-            current={curPage}
-            total={total}
-            showTotal={total => `共 ${total} 条`}
-          />
-        </div> : "" : <Nodata _html="暂无数据" />}
-      </React.Fragment>
-    }
-  }
+  const showListComponent = () => {
+    setShowChart(false);
+    setShowList1(true)
+  };
 
   return (
     <React.Fragment>
-      <img alt="图片加载失败" src={noticePng} width="100%"></img>
-      <div className="centerbox notice-list clearfix">
-        <div className="body">
-        <Affix className="affix-list-left" offsetTop={90}>
-          <div className="navigationMenu">
-            <ul className="menu-ul">
-              <li className="MenuTitle" onClick={()=>click('0')}><span><i className="iconfont icon-xiangmugonggao"></i>成果来源</span></li>
-              {
-                achieveSource.map(item=>{
-                  return <li className={tab == item.code ? "active" : ""} onClick={()=>click(item.code)} key={item.code}><span>{item.name}</span></li>
-                })
-              }
-            </ul>
-          </div>
-          </Affix>
-          <div className="notice-center-content">
-            {sortNav()}
-            {loading ? <Loading /> : content()}
-          </div>
+
+      <div className="banner">
+        <img alt="图片加载失败" src={noticePng} className="banner-img"></img>
+        <div className="button-container">
+          <button className={`button ${selectedButton === 'chart' ? 'selected' : ''}`} onClick={() => handleButtonClick('chart')}>成果概览</button>
+          <button className={`button ${selectedButton === 'list' ? 'selected' : ''}`} onClick={() => handleButtonClick('list')}>成果列表</button>        
         </div>
       </div>
+      {showChart && <AchivChart />}
+      {showList1 && < NoticeList />}
+
     </React.Fragment>
   )
 }
\ No newline at end of file
diff --git a/src/military/achievement/overview/index.scss b/src/military/achievement/overview/index.scss
index 2c2eabe92..7b25048a3 100644
--- a/src/military/achievement/overview/index.scss
+++ b/src/military/achievement/overview/index.scss
@@ -1,215 +1,41 @@
-.notice-list{
-  .ant-tabs {
-    .ant-tabs-left-bar{
-      border: 1px solid #E5E5E5;
-      .ant-tabs-nav-container{
-        margin-right: 0;
-      }
-      .ant-tabs-nav-wrap{
-        margin-right: 0;
-      }
-
-      svg{
-        margin-right:.75em;
-      }
-    }
-    .ant-tabs-tab{
-      display: flex;
-      justify-content: start;
-      align-items: center;
-      margin-bottom: 0.5rem;
-      width: 13.5rem;
-      height: 2.8125rem;
-      background: #fff;
-      font-size: 1.125rem;
-      
-    }
-    .ant-tabs-left-content{
-      border: 0;
-    }
-    .ant-tabs-tab-active{
-      background: #1890FF;
-      color: #fff;
-    }
-    .ant-tabs-ink-bar{
-      display: none !important;
-    }
-  }
-  
-  .notice-sort-nav{
-    display: flex;
-    justify-content: space-between;
-    padding: .3rem 2rem 1.5rem;
-    margin: 0px -1.25rem;
-    border-bottom: 1px solid #E0E0E0;
-    .ant-input:hover{
-      border-color: #4154f1;
-    }
-    .ant-btn-primary{
-      background-color: #4154f1;
-      &:hover{
-        opacity: 0.8;
-      }
-    }
-  }
-
-  .notice-center-content{
-    padding:1.25rem;
-    background: #fff;
-    flex: auto;
-  }
-
-  .item-head-title{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 1.25rem 0 .6rem 0;
-    .item-head-title-content{
-      display: flex;
-      align-items: center;
-      font-size: 1rem;
-      span{
-        font-weight: bold;
-      }
-      i{
-        margin-right: .25em;
-        color: #4154f1;
-      }
-    }
-  }
-
-  .ant-input-group-addon{
-    border: 0 !important;
-  }
-
-  .item-head-title{
-    border-bottom: 1px solid #E5E5E5;
-  }
-
-}
-
-.center-right-but{
-  caret-color: rgba(0, 0, 0, 0);
-  .piece{
-    margin:0 .8rem;
-    color: #aaa;
-  }
-  .sortLink{
-    color: #333;
-    cursor: pointer;
-    &:hover{
-      color: #4154f1;
-    }
-    &.active{
-      color: #4154f1;
-    }
-  }
-}
-
-.body{
+.banner {
   display: flex;
-  justify-content: space-between;
-  margin-top: -20px;
-
-  .navigationMenu{
-    margin-right: 20px;
-    width: 20.8em;
-    caret-color: rgba(0, 0, 0, 0);
-    .menu-ul:last-child{
-      margin-top: 12px;
-    }
+  justify-content: center;
+  align-items: center;
+  height: 622px; 
+  position: relative;
+  .banner-img {
+    width: 1200px;
+    height: 572px;
+    max-width: 100%;
+    max-height: 100%;
   }
-
-  .none_p_title{
-    text-align: center;
-  }
-}
-
-.menu-ul{
-  background-color: white;
-  margin-bottom: 12px;
-  border-radius:2px;
-
-  .MenuTitle{
-    border-bottom: 1px solid #E0E0E0;
-
-    span{
-      display: block;
+  .button-container {
+    height: 50px;
+    width: 520px;
+    display: flex;
+    justify-content: center;
+    position: absolute;
+    bottom: 0px;
+    .button {
       width: 50%;
-      height: 100%;
-      cursor: pointer;
-      border-bottom: 0px solid;
-      i{
-        color: #afaaae;
-      }
+      background:#f6f7fa;
+      border:2px solid;
+      border-color:#ffffff;
+      border-radius:4px 0px 0px 4px;
+      box-shadow:0px 0px 15px rgba(30, 47, 162, 0.09);
     }
-
-    span:hover{
-      color: #4154f1;
-      .iconfont{
-        color: #4154f1 !important;
-      }
+    .button:hover {
+      background:#2a3ee9;
+      color: white;
     }
-  }
-
-  li{
-    padding:0px 0px 0px 20px;
-    position: relative;
-    height: 62px;
-    line-height: 62px;
-    font-size: 16px;
-    color: #333;
-    span{
-      display: block;
-      height: 62px; 
-      cursor: pointer;
-      border-bottom: 1px solid #eee;
+    .button:active {
+      background:#2a3ee9;
+      color: white;
     }
-
-    &:last-child > span{
-      border-bottom: none;
+    .button.selected {
+      background:#2a3ee9;
+      color: white;
     }
   }
-
-  li:hover{
-    background: #fafafa;
-  }
-
-  .active{
-    background-color: #fafafa;
-    & ::before{
-      position: absolute;
-      left: 0px;
-      top: 15px;
-      width: 6px;
-      content: '';
-      height: 30px;
-      background: #4154f1;
-    }
-  }
-
-  & i{
-    margin-right: 5px;
-  }
 }
-
-.ant-input-group-addon .ant-btn-lg {
-  height: 40px;
-}
-
-.edu-txt-center .ant-pagination {
-  margin: 2rem auto;
-  text-align: center;
-  .ant-pagination-item:focus, .ant-pagination-item:hover, .ant-pagination-item-active, .ant-pagination-prev:hover a, .ant-pagination-next:hover a, .ant-pagination-options-quick-jumper input:focus, .ant-pagination-options-quick-jumper input:hover{
-    border-color: #4154f1;
-  }
-  .ant-pagination-disabled{
-    & a, & :hover a, & :focus a, & .ant-pagination-item-link, &:hover .ant-pagination-item-link , &:focus .ant-pagination-item-link {
-      color: rgba(0, 0, 0, 0.25) !important;
-      border-color: #d9d9d9;
-    }
-  }
-  .ant-pagination-item-active a{
-    color: #4154f1
-  }
-}
\ No newline at end of file

From 7ebd61f205d63bfd60893b7589f45cdadd27feac Mon Sep 17 00:00:00 2001
From: zhangxiaozhuozhuo <7658685+zhangxiaozhuozhuo@user.noreply.gitee.com>
Date: Sun, 19 Nov 2023 14:18:32 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement/achivChart/index.jsx |  14 ++-
 .../achievement/achivChart/index.scss         |  42 ++++----
 src/military/achievement/api.js               |  15 +++
 .../achievement/components/itemList/index.jsx |   7 +-
 .../components/itemList/index.scss            | 100 +++++++++++-------
 .../achievement/noticeList/index.scss         |   1 +
 src/military/achievement/overview/index.scss  |   3 +-
 7 files changed, 120 insertions(+), 62 deletions(-)

diff --git a/src/military/achievement/achivChart/index.jsx b/src/military/achievement/achivChart/index.jsx
index eb3b4b41e..0a11e1491 100644
--- a/src/military/achievement/achivChart/index.jsx
+++ b/src/military/achievement/achivChart/index.jsx
@@ -3,6 +3,7 @@ import echarts from 'echarts';
 import './index.scss';
 import topCountPng from '../image/left_top_icon.png';
 import botCountPng from '../image/left_bot_icon.png';
+import { getAchivChart } from '../api';
 
 function AchivChart() {
   useEffect(() => {
@@ -60,7 +61,18 @@ function AchivChart() {
             { value: 45, name: '科研成果 32%' },
             { value: 52, name: '装备成果 40%' },
             { value: 66, name: '其他成果 50%' }
-          ]
+          ],
+          label: {
+            show: true,
+            position: 'inside',
+            color: 'white',
+            formatter: function (params) {
+              return Math.round(params.percent) + '%';
+            },
+            textStyle: {
+                fontSize: 20
+            }
+          }
         }
       ],
       graphic: {
diff --git a/src/military/achievement/achivChart/index.scss b/src/military/achievement/achivChart/index.scss
index 99f7b4235..baa5ffaad 100644
--- a/src/military/achievement/achivChart/index.scss
+++ b/src/military/achievement/achivChart/index.scss
@@ -1,6 +1,6 @@
 
 #mainContent {
-    margin: 40px auto 0 auto;
+    margin: 10px auto 0 auto;
     width: 1200px;
     height: 450px;
     display: flex;
@@ -8,12 +8,12 @@
     box-shadow:8px 6px 18px rgba(171, 202, 255, 0.24) inset;
 
     #leftBox {
-        width: 500px;
+        width: 550px;
         height: 450px; 
         position: relative;
         .count-top {
             display: flex;
-            width: 180px;
+            width: 190px;
             height: 95px;
             position: absolute;
             top: 87px;
@@ -39,30 +39,31 @@
                 height: 95px;
                 display: flex;
                 flex-direction: column;
+                justify-content: center;
                 #count-num {
                     width: 100%;
-                    height: 55px;
-                    line-height: 55px;
+                    height: 35px;
+                    line-height: 35px;
                     // font-family:Alibaba PuHuiTi;
                     font-weight:600;
                     color:#283444;
                     font-size:24px;
                     letter-spacing:2px;
                 }
-                // .count-title {
-                //     width: 100%;
-                //     height: 40px;
-                //     line-height: 40px;
-                //     // font-family:Alibaba PuHuiTi;
-                //     color:#445a7a;
-                //     font-size:15px;
-                //     letter-spacing:50px;
-                // }
+                .count-title {
+                    width: 100%;
+                    height: 30px;
+                    line-height: 30px;
+                    // font-family:Alibaba PuHuiTi;
+                    color:#445a7a;
+                    font-size:15px;
+                    letter-spacing:1px;
+                }
             }
         }
         .count-bot {
             display: flex;
-            width: 180px;
+            width: 190px;
             height: 95px;
             position: absolute;
             top: 227px;
@@ -89,24 +90,23 @@
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
-                align-items: center;
                 #count-num {
                     width: 100%;
-                    height: 55px;
+                    height: 35px;
+                    line-height: 35px;
                     // font-family:Alibaba PuHuiTi;
                     font-weight:600;
                     color:#283444;
                     font-size:24px;
-                    line-height: 30px;
                     letter-spacing:2px;
                 }
                 .count-title {
                     width: 100%;
-                    height: 40px;
+                    height: 30px;
+                    line-height: 30px;
                     // font-family:Alibaba PuHuiTi;
                     color:#445a7a;
                     font-size:15px;
-                    line-height: 20px;
                     letter-spacing:1px;
                 }
             }
@@ -117,7 +117,7 @@
         height: 450px;
     }
     #blankBox {
-        width: 200px;
+        width: 150px;
         height: 450px;
     }
 }
diff --git a/src/military/achievement/api.js b/src/military/achievement/api.js
index 5100db141..f88b73c6f 100644
--- a/src/military/achievement/api.js
+++ b/src/military/achievement/api.js
@@ -1,6 +1,21 @@
 import fetch from './fetch';
 import { notification } from 'antd';
 
+// 成果概览查询
+export async function getAchivChart() {
+  let res = await fetch({
+    url: '/api/',
+    method: 'get'
+  });
+  if (res.message === 'success') {
+    return res.data;
+  } else {
+    notification.open({
+      message: "提示",
+      description: res.message || '请求错误',
+    });
+  }
+}
 
 // 成果列表查询
 export async function getNoticeList(params) {
diff --git a/src/military/achievement/components/itemList/index.jsx b/src/military/achievement/components/itemList/index.jsx
index db51d09f8..f6cabb36e 100644
--- a/src/military/achievement/components/itemList/index.jsx
+++ b/src/military/achievement/components/itemList/index.jsx
@@ -12,10 +12,15 @@ export default (props) => {
             {item.achievementName || item.title} {item.new && <NewSvg color="#ffb300"/>}
           </div>
           <div className="list-other">
-            {item.publisher && <p>发布单位：{item.publisher}</p>}
+            <p>成果来源：{item.achievementSource || '未知'}</p>
+            <p>发布单位：{item.publisher || '未知'}</p>
             <p>发布时间：{(item.publishDate && item.publishDate.split(' ')[0]) || (item.createTime && item.createTime.split(' ')[0])}</p>
+            <p>下载量：{item.attachmentDownloadCount || '0'}</p>
             <p><i className="iconfont icon-dianjiliang mr5 font-12" />{item.visits || 0}</p>
           </div>
+          <div className="list-text">
+            <p>摘要：{item.text && item.text.substring(3, item.text.length-4)}</p>
+          </div>
         </div>
       )
     })
diff --git a/src/military/achievement/components/itemList/index.scss b/src/military/achievement/components/itemList/index.scss
index c920cd3e8..7bc27299d 100644
--- a/src/military/achievement/components/itemList/index.scss
+++ b/src/military/achievement/components/itemList/index.scss
@@ -3,45 +3,69 @@
   padding: 17px 20px;
   background: #fff;
   border-bottom: 1px dashed #dedede;
-}
-.list-title {
-  font-size: 1rem;
-  color: #000;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  svg {
-    margin-left: 0.5rem;
-  }
-}
-.list-title:hover {
-  color: #4154f1;
-}
-.list-title span {
-  padding: 3px 5px;
-  margin-left: 0.5em;
-  background: #f8c753;
-  font-size: 13px;
-  color: #fff;
-  border-radius: 3px;
-}
 
-.list-other {
-  margin-top: 0.5rem;
-  display: flex;
-  align-items: center;
-  & > p {
-    display: inline-block;
-    font-size: 0.875rem;
-    color: #666;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  .list-title {
+    font-size: 1rem;
+    color: #000;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    svg {
+      margin-left: 0.5rem;
+    }
   }
-  p:first-child{
-    width: 50%;
+  .list-title:hover {
+    color: #4154f1;
   }
-  p:nth-child(2){
-    width: 40%;
+  .list-title span {
+    padding: 3px 5px;
+    margin-left: 0.5em;
+    background: #f8c753;
+    font-size: 13px;
+    color: #fff;
+    border-radius: 3px;
   }
-}
+
+  .list-other {
+    margin-top: 0.5rem;
+    display: flex;
+    align-items: center;
+    & > p {
+      display: inline-block;
+      font-size: 0.875rem;
+      color: #666;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    p:first-child{
+      width: 25%;
+    }
+    p:nth-child(2){
+      width: 25%;
+    }
+    p:nth-child(3){
+      width: 25%;
+    }
+    p:nth-child(4){
+      width: 15%;
+    }
+    p:nth-child(5){
+      width: 10%;
+    }
+  }
+
+  .list-text {
+    p {
+      width: 100%;
+      // height: 56px;
+      height: 30px;
+      font-size: 0.875rem;
+      color: #666;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/src/military/achievement/noticeList/index.scss b/src/military/achievement/noticeList/index.scss
index 2c2eabe92..c7c23546c 100644
--- a/src/military/achievement/noticeList/index.scss
+++ b/src/military/achievement/noticeList/index.scss
@@ -54,6 +54,7 @@
   }
 
   .notice-center-content{
+    width: 889px;
     padding:1.25rem;
     background: #fff;
     flex: auto;
diff --git a/src/military/achievement/overview/index.scss b/src/military/achievement/overview/index.scss
index 7b25048a3..257ac6eda 100644
--- a/src/military/achievement/overview/index.scss
+++ b/src/military/achievement/overview/index.scss
@@ -4,6 +4,7 @@
   align-items: center;
   height: 622px; 
   position: relative;
+  margin-top: -100px;
   .banner-img {
     width: 1200px;
     height: 572px;
@@ -16,7 +17,7 @@
     display: flex;
     justify-content: center;
     position: absolute;
-    bottom: 0px;
+    bottom: 20px;
     .button {
       width: 50%;
       background:#f6f7fa;

From 0e5e1e0e88864581218676f21d4f31d6b2c17596 Mon Sep 17 00:00:00 2001
From: zhangxiaozhuozhuo <7658685+zhangxiaozhuozhuo@user.noreply.gitee.com>
Date: Mon, 20 Nov 2023 13:19:48 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement/achivChart/index.jsx | 185 ++++++++++--------
 src/military/achievement/api.js               |   2 +-
 2 files changed, 102 insertions(+), 85 deletions(-)

diff --git a/src/military/achievement/achivChart/index.jsx b/src/military/achievement/achivChart/index.jsx
index 0a11e1491..529251faa 100644
--- a/src/military/achievement/achivChart/index.jsx
+++ b/src/military/achievement/achivChart/index.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import echarts from 'echarts';
 import './index.scss';
 import topCountPng from '../image/left_top_icon.png';
@@ -6,93 +6,110 @@ import botCountPng from '../image/left_bot_icon.png';
 import { getAchivChart } from '../api';
 
 function AchivChart() {
-  useEffect(() => {
-    // 基于准备好的dom，初始化echarts实例
-    const myChart = echarts.init(document.getElementById('chartBox'));
+  const [achivData, setAchivData] = useState('');
 
-    // 指定图表的配置项和数据
-    const option = {
-      title: {
-        text: '成果数量占比统计',
-        left: 'center',
-        top: 350,
-        textStyle: {
-          fontSize: 18
-        }
-      },
-      legend: {
-        orient: 'vertical',
-        right: 30,
-        top: 85,
-        itemGap: 16,
-        itemWidth: 32,
-        itemHeight: 24,
-        textStyle: {
-          fontSize: 16
-        }
-      },
-      color: [
-        'rgba(183, 88, 255, 1)',
-        'rgba(255, 190, 56, 1)',
-        'rgba(240, 68, 95, 1)',
-        'rgba(88, 113, 255, 1)',
-        'rgba(36, 185, 168, 1)',
-        'rgba(88, 183, 255, 1)'
-      ],
-      series: [
-        {
-          name: 'Nightingale Chart',
-          type: 'pie',
-          radius: [35, 160],
-          center: ['150', '50%'],
-          roseType: 'area',
-          clockwise: true,
-          startAngle: 45,
-          label: {
-            show: false
-          },
-          itemStyle: {
-            borderRadius: 0
-          },
-          data: [
-            { value: 19, name: '开源项目 10%' },
-            { value: 28, name: '创客任务 20%' },
-            { value: 32, name: '开放竞赛 25%' },
-            { value: 45, name: '科研成果 32%' },
-            { value: 52, name: '装备成果 40%' },
-            { value: 66, name: '其他成果 50%' }
-          ],
-          label: {
-            show: true,
-            position: 'inside',
-            color: 'white',
-            formatter: function (params) {
-              return Math.round(params.percent) + '%';
+  useEffect(() => {
+    // 拿到成果概览数据
+    getAchivChart().then(data => {
+        console.log('@@@成果概览数据:',data);
+        setAchivData(data);
+    });
+  }, []);
+
+  useEffect(() => {
+    if (Object.keys(achivData).length > 0) {
+      // 基于准备好的dom，初始化echarts实例
+      const myChart = echarts.init(document.getElementById('chartBox'));
+      // 计算总成果数量
+      const keysToExclude = ['viewCount', 'acCount'];
+      const total = Object.keys(achivData).filter(key => !keysToExclude.includes(key)).reduce((acc, key) => acc + achivData[key], 0);
+      console.log('@@@总成果数量:',total);
+
+      // 指定图表的配置项和数据
+      const option = {
+        title: {
+          text: '成果数量占比统计',
+          left: 'center',
+          top: 380,
+          textStyle: {
+            fontSize: 18
+          }
+        },
+        legend: {
+          orient: 'vertical',
+          right: 10,
+          top: 85,
+          itemGap: 16,
+          itemWidth: 32,
+          itemHeight: 24,
+          textStyle: {
+            fontSize: 16
+          }
+        },
+        color: [
+          'rgba(183, 88, 255, 1)',
+          'rgba(255, 190, 56, 1)',
+          'rgba(240, 68, 95, 1)',
+          'rgba(88, 113, 255, 1)',
+          'rgba(36, 185, 168, 1)',
+          'rgba(88, 183, 255, 1)'
+        ],
+        series: [
+          {
+            name: 'Nightingale Chart',
+            type: 'pie',
+            radius: [35, 160],
+            center: ['150', '50%'],
+            roseType: 'area',
+            clockwise: true,
+            startAngle: 45,
+            label: {
+              show: false
             },
-            textStyle: {
-                fontSize: 20
+            itemStyle: {
+              borderRadius: 0
+            },
+            data: [
+              { value: achivData.osProjectCount, name: '开源项目 ' + (achivData.osProjectCount / total * 100).toFixed(0) + '%' },
+              { value: achivData.ckTaskCount, name: '创客任务 ' + (achivData.ckTaskCount / total * 100).toFixed(0) + '%' },
+              { value: achivData.osContestCount, name: '开放竞赛 ' + (achivData.osContestCount / total * 100).toFixed(0) + '%' },
+              { value: achivData.scienceAchievementCount, name: '科研成果 ' + (achivData.scienceAchievementCount / total * 100).toFixed(0) + '%' },
+              { value: achivData.ckTaskCount, name: '装备成果 ' + (achivData.ckTaskCount / total * 100).toFixed(0) + '%' },
+              { value: achivData.anotherCount, name: '其他成果 ' + (achivData.anotherCount / total * 100).toFixed(0) + '%' }
+            ],
+            label: {
+              show: true,
+              position: 'inside',
+              color: 'white',
+              formatter: function (params) {
+                return Math.round(params.percent) + '%';
+              },
+              textStyle: {
+                  fontSize: 20
+              }
             }
           }
+        ],
+        graphic: {
+          type: 'text',
+          left: '133',
+          top: 'middle',
+          style: {
+            text: '成果\n类型',
+            fill: '#333',
+            fontSize: 18,
+            fontWeight: 'bold',
+            verticalAlign: 'middle',
+            lineHeight: 24
+          }
         }
-      ],
-      graphic: {
-        type: 'text',
-        left: '133',
-        top: 'middle',
-        style: {
-          text: '成果\n类型',
-          fill: '#333',
-          fontSize: 18,
-          fontWeight: 'bold',
-          verticalAlign: 'middle',
-          lineHeight: 24
-        }
-      }
-    };
+      };
 
-    // 使用刚指定的配置项和数据显示图表。
-    myChart.setOption(option);
-  }, []);
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+
+    }
+  }, [achivData]); 
 
   return (
     <div id='mainContent'>
@@ -102,7 +119,7 @@ function AchivChart() {
             <img alt="icon" src={topCountPng}></img>
           </div>
           <div className='count-main'>
-            <p id='count-num'>5896</p>
+            <p id='count-num'>{achivData.acCount}</p>
             <p className='count-title'>收录成果数</p>
           </div>
         </div>
@@ -111,7 +128,7 @@ function AchivChart() {
             <img alt="icon" src={botCountPng}></img>
           </div>
           <div className='count-main'>
-            <p id='count-num'>159</p>
+            <p id='count-num'>{achivData.viewCount}</p>
             <p className='count-title'>成果总浏览数</p>
           </div>
         </div>
diff --git a/src/military/achievement/api.js b/src/military/achievement/api.js
index f88b73c6f..e35ab5ed4 100644
--- a/src/military/achievement/api.js
+++ b/src/military/achievement/api.js
@@ -4,7 +4,7 @@ import { notification } from 'antd';
 // 成果概览查询
 export async function getAchivChart() {
   let res = await fetch({
-    url: '/api/',
+    url: '/api/achievement/chart/',
     method: 'get'
   });
   if (res.message === 'success') {

From 6088c0f6e10dbd7efbad3f92bec62af956d1ae33 Mon Sep 17 00:00:00 2001
From: zhangxiaozhuozhuo <7658685+zhangxiaozhuozhuo@user.noreply.gitee.com>
Date: Mon, 20 Nov 2023 14:55:44 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=88=90=E6=9E=9C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement.js                   | 13 +++----
 .../achievement/components/itemList/index.jsx | 15 ++++++--
 src/military/achievement/noticeList/index.jsx | 34 ++++++++++++-------
 src/military/achievement/overview/index.jsx   |  2 +-
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/military/achievement.js b/src/military/achievement.js
index c8929bcaf..5b8f84710 100644
--- a/src/military/achievement.js
+++ b/src/military/achievement.js
@@ -60,12 +60,13 @@ class Index extends Component {
             )}
           ></Route>
 
-            <Route
-                path="/achievement/overview"
-                render={(props) => (
-                    <Overview {...this.props} {...props} />
-                )}
-            ></Route>
+          <Route
+            path="/achievement/overview"
+            render={(props) => (
+                <Overview {...this.props} {...props} />
+            )}
+          ></Route>
+
         </Switch>
       </div>
     );
diff --git a/src/military/achievement/components/itemList/index.jsx b/src/military/achievement/components/itemList/index.jsx
index f6cabb36e..0ab7bcad2 100644
--- a/src/military/achievement/components/itemList/index.jsx
+++ b/src/military/achievement/components/itemList/index.jsx
@@ -3,12 +3,23 @@ import { NewSvg } from '../../svg';
 import './index.scss';
 export default (props) => {
   const { list, itemClick, } = props;
+  let cleanedText = '';
 
   return (
     list.map(item => {
+      if (item.text) {
+        cleanedText = item.text.replace(/<p>|<\/p>/g, '');
+      } else {
+        cleanedText = '';
+      }
+      console.log('@@@',item.id);
+      
       return (
         <div className="list-box" key={item.id}>
-          <div className="list-title" onClick={() => { itemClick(item.id) }}>
+          <div className="list-title" onClick={() => { 
+              console.log('###点击了：'+item.id)
+              itemClick(item.id) 
+            }}>
             {item.achievementName || item.title} {item.new && <NewSvg color="#ffb300"/>}
           </div>
           <div className="list-other">
@@ -19,7 +30,7 @@ export default (props) => {
             <p><i className="iconfont icon-dianjiliang mr5 font-12" />{item.visits || 0}</p>
           </div>
           <div className="list-text">
-            <p>摘要：{item.text && item.text.substring(3, item.text.length-4)}</p>
+            <p>摘要：{cleanedText}</p>
           </div>
         </div>
       )
diff --git a/src/military/achievement/noticeList/index.jsx b/src/military/achievement/noticeList/index.jsx
index 6d298658a..f95a0d011 100644
--- a/src/military/achievement/noticeList/index.jsx
+++ b/src/military/achievement/noticeList/index.jsx
@@ -79,15 +79,19 @@ export default (props) => {
     }
   }, [tab, title, orderBy, curPage]);
 
+  // @@@ 排序实现逻辑
   function changeSort(sortType) {
     setOrderBy(sortType);
     setCurPage(1);
   }
 
+  // @@@ 跳转到成果详情页 
   function noticeClick(id) {
+    console.log('$$$noticeClick:'+id)
     props.history.push(`/achievement/noticeDetail/${id}`);
   }
 
+  // @@@ 右侧 上方 搜索、排序功能的DOM
   function sortNav() {
     return <div className="notice-sort-nav">
       <Search
@@ -105,6 +109,7 @@ export default (props) => {
     </div>
   }
 
+  // @@@ 查看更多 跳转逻辑
   function handleClick(e) {
     setTab(e.key);
     setCurPage(1);
@@ -112,6 +117,7 @@ export default (props) => {
     setOrderBy('publishDateDesc');
   }
 
+  // @@@ 左侧menu菜单项 跳转逻辑
   function click(e){
     setTab(e);
     setCurPage(1);
@@ -119,25 +125,27 @@ export default (props) => {
     setOrderBy('publishDateDesc');
   }
 
+  // @@@ 右侧根据成果来源类型 分块显示 的 实现逻辑
   function cont(param, titleStr, key, svgStr) {
-    return <React.Fragment>
-      <div className="item-head-title">
-        <div className="item-head-title-content">
-          <i className={svgStr}></i>
-          <span>{titleStr}</span>
+    return (
+      <React.Fragment>
+        <div className="item-head-title">
+          <div className="item-head-title-content">
+            <i className={svgStr}></i>
+            <span>{titleStr}</span>
+          </div>
+          {param.length === 5 && <span className="link" onClick={() => { handleClick({ key: key }) }}>查看更多 <Icon type="arrow-right" /></span>}
         </div>
-        {param.length === 5 && <span className="link" onClick={() => { handleClick({ key: key }) }}>查看更多 <Icon type="arrow-right" /></span>}
-      </div>
-      {param.length > 0 ? <ItemList
-        list={param}
-        itemClick={noticeClick}
-      /> : <Nodata _html="暂无数据" />}
-    </React.Fragment>
+        {param.length > 0 ? <ItemList list={param} itemClick={noticeClick} /> : <Nodata _html="暂无数据" />}
+      </React.Fragment>
+    )
   }
 
   // 成果库具体jsx渲染函数
+  // @@@ 右侧 下方
   function content() {
     if (tab === '0') {
+      // @@@ 如果选中“成果来源” 默认选项 右侧显示逻辑
       if(callList.length === 0 && changeList.length === 0 && competitionList.length === 0 && checkList.length === 0 && abandonList.length === 0){
         return <React.Fragment><Nodata _html="暂无数据" /></React.Fragment>
       }else{
@@ -150,6 +158,7 @@ export default (props) => {
         </React.Fragment>
       }
     } else {
+      // @@@ 如果选中除“成果来源” 外其他选项 右侧显示逻辑
       let titleStr;
       let svgStr;
       switch (tab) {
@@ -198,6 +207,7 @@ export default (props) => {
     }
   }
 
+  // @@@ 【成果列表】整体（包含：左侧 右侧 ）的主界面DOM
   return (
     <React.Fragment>
       <div className="centerbox notice-list clearfix">
diff --git a/src/military/achievement/overview/index.jsx b/src/military/achievement/overview/index.jsx
index 27c8ccee1..5536c0030 100644
--- a/src/military/achievement/overview/index.jsx
+++ b/src/military/achievement/overview/index.jsx
@@ -40,7 +40,7 @@ export default (props) => {
         </div>
       </div>
       {showChart && <AchivChart />}
-      {showList1 && < NoticeList />}
+      {showList1 && <NoticeList {...props} />}
 
     </React.Fragment>
   )

From c2e9249fd822793f249993f2b2ffae21f213e025 Mon Sep 17 00:00:00 2001
From: zhangxiaozhuozhuo <7658685+zhangxiaozhuozhuo@user.noreply.gitee.com>
Date: Mon, 20 Nov 2023 15:34:54 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=88=90=E6=9E=9C=E6=A6=82=E8=A7=88?=
 =?UTF-8?q?=E9=A5=BC=E7=8A=B6=E5=9B=BE=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement/achivChart/index.jsx | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/military/achievement/achivChart/index.jsx b/src/military/achievement/achivChart/index.jsx
index 529251faa..802c456d1 100644
--- a/src/military/achievement/achivChart/index.jsx
+++ b/src/military/achievement/achivChart/index.jsx
@@ -21,9 +21,9 @@ function AchivChart() {
       // 基于准备好的dom，初始化echarts实例
       const myChart = echarts.init(document.getElementById('chartBox'));
       // 计算总成果数量
-      const keysToExclude = ['viewCount', 'acCount'];
-      const total = Object.keys(achivData).filter(key => !keysToExclude.includes(key)).reduce((acc, key) => acc + achivData[key], 0);
-      console.log('@@@总成果数量:',total);
+      // const keysToExclude = ['viewCount', 'acCount'];
+      // const total = Object.keys(achivData).filter(key => !keysToExclude.includes(key)).reduce((acc, key) => acc + achivData[key], 0);
+      // console.log('@@@总成果数量:',total);
 
       // 指定图表的配置项和数据
       const option = {
@@ -70,20 +70,18 @@ function AchivChart() {
               borderRadius: 0
             },
             data: [
-              { value: achivData.osProjectCount, name: '开源项目 ' + (achivData.osProjectCount / total * 100).toFixed(0) + '%' },
-              { value: achivData.ckTaskCount, name: '创客任务 ' + (achivData.ckTaskCount / total * 100).toFixed(0) + '%' },
-              { value: achivData.osContestCount, name: '开放竞赛 ' + (achivData.osContestCount / total * 100).toFixed(0) + '%' },
-              { value: achivData.scienceAchievementCount, name: '科研成果 ' + (achivData.scienceAchievementCount / total * 100).toFixed(0) + '%' },
-              { value: achivData.ckTaskCount, name: '装备成果 ' + (achivData.ckTaskCount / total * 100).toFixed(0) + '%' },
-              { value: achivData.anotherCount, name: '其他成果 ' + (achivData.anotherCount / total * 100).toFixed(0) + '%' }
+              { value: achivData.osProjectCount, name: '开源项目 ' + achivData.osProjectCount + '%' },
+              { value: achivData.ckTaskCount, name: '创客任务 ' + achivData.ckTaskCount + '%' },
+              { value: achivData.osContestCount, name: '开放竞赛 ' + achivData.osContestCount + '%' },
+              { value: achivData.scienceAchievementCount, name: '科研成果 ' + achivData.scienceAchievementCount + '%' },
+              { value: achivData.equipAchievement, name: '装备成果 ' + achivData.equipAchievement + '%' },
+              { value: achivData.anotherCount, name: '其他成果 ' + achivData.anotherCount + '%' }
             ],
             label: {
               show: true,
               position: 'inside',
               color: 'white',
-              formatter: function (params) {
-                return Math.round(params.percent) + '%';
-              },
+              formatter: '{c}%', // 显示数据名称和百分比
               textStyle: {
                   fontSize: 20
               }

From 24f8f631a51a465fe0d8bd9629e608f85fb116c1 Mon Sep 17 00:00:00 2001
From: zhangxiaozhuozhuo <7658685+zhangxiaozhuozhuo@user.noreply.gitee.com>
Date: Mon, 20 Nov 2023 16:16:16 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A3=85=E5=A4=87?=
 =?UTF-8?q?=E6=88=90=E6=9E=9C=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement/noticeList/index.jsx | 21 +++++++++++++++----
 src/military/achievement/static.js            |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/military/achievement/noticeList/index.jsx b/src/military/achievement/noticeList/index.jsx
index f95a0d011..e5844e16b 100644
--- a/src/military/achievement/noticeList/index.jsx
+++ b/src/military/achievement/noticeList/index.jsx
@@ -25,13 +25,15 @@ export default (props) => {
   const [callList, setCallList] = useState([]);
   const [changeList, setChangeList] = useState([]);
   const [checkList, setCheckList] = useState([]);
-  const [abandonList, setAbandonList] = useState([]);
+  const [equipList, setEquipList] = useState([]); // @@@ 装备成果
+  const [abandonList, setAbandonList] = useState([]); 
   const [competitionList, setCompetitionList] = useState([]);
   const [dealList, setDealList] = useState([]);
 
   useEffect(() => {
     setLoading(true);
     if (tab === '0' || tab === '7') {
+      // @@@ 按照类别 显示所有成果
       const params = {
         orderBy,
         curPage: 1,
@@ -55,11 +57,17 @@ export default (props) => {
       getNoticeList({ ...params,achievementSource:'科研成果' }).then(data => {
         setCheckList(data.rows);
       });
+      // @@@ add
+      getNoticeList({ ...params,achievementSource:'装备成果' }).then(data => {
+        setEquipList(data.rows);
+        setLoading(false);
+      });
       getNoticeList({ ...params,achievementSource:'其他' }).then(data => {
         setAbandonList(data.rows);
         setLoading(false);
       });
     } else {
+      // @@@ 显示选中类别成果
       const params = {
         orderBy,
         curPage,
@@ -91,7 +99,7 @@ export default (props) => {
     props.history.push(`/achievement/noticeDetail/${id}`);
   }
 
-  // @@@ 右侧 上方 搜索、排序功能的DOM
+  // @@@ 右侧上方 搜索、排序功能的DOM
   function sortNav() {
     return <div className="notice-sort-nav">
       <Search
@@ -141,12 +149,12 @@ export default (props) => {
     )
   }
 
-  // 成果库具体jsx渲染函数
   // @@@ 右侧 下方
   function content() {
+    // 成果库具体jsx渲染函数
     if (tab === '0') {
       // @@@ 如果选中“成果来源” 默认选项 右侧显示逻辑
-      if(callList.length === 0 && changeList.length === 0 && competitionList.length === 0 && checkList.length === 0 && abandonList.length === 0){
+      if(callList.length === 0 && changeList.length === 0 && competitionList.length === 0 && checkList.length === 0  && equipList.length === 0 && abandonList.length === 0){
         return <React.Fragment><Nodata _html="暂无数据" /></React.Fragment>
       }else{
         return <React.Fragment>
@@ -154,6 +162,7 @@ export default (props) => {
           {cont(changeList, "创客任务", '创客任务', "iconfont icon-gengzhenggonggao")}
           {cont(competitionList, "开放竞赛", '开放竞赛', "iconfont icon-chengjiaogonggao")}
           {cont(checkList, "科研成果", '科研成果', "iconfont icon-zhongbiaogonggao")}
+          {cont(equipList, "装备成果", '装备成果', "iconfont icon-ruanjiangongcheng1")}
           {cont(abandonList, "其他", '其他', "iconfont icon-feibiaogonggao")}
         </React.Fragment>
       }
@@ -178,6 +187,10 @@ export default (props) => {
           titleStr = "科研成果";
           svgStr = "iconfont icon-feibiaogonggao"
           break;
+        case '装备成果':
+          titleStr = "装备成果";
+          svgStr = "iconfont icon-ruanjiangongcheng1"
+          break;
         case '其他':
           titleStr = "其他";
           svgStr = "iconfont icon-zhaobiaogonggao"
diff --git a/src/military/achievement/static.js b/src/military/achievement/static.js
index eed25495e..6fc85389f 100644
--- a/src/military/achievement/static.js
+++ b/src/military/achievement/static.js
@@ -14,6 +14,7 @@ export const achieveSource = [
   { code: "创客任务", name: "创客任务" },
   { code: "开放竞赛", name: "开放竞赛" },
   { code: "科研成果", name: "科研成果" },
+  { code: "装备成果", name: "装备成果" },
   { code: "其他", name: "其他" },
 ];
 

From ff81c1523d555f530445edf18fe4b03450258fe8 Mon Sep 17 00:00:00 2001
From: zhangxiaozhuozhuo <7658685+zhangxiaozhuozhuo@user.noreply.gitee.com>
Date: Tue, 21 Nov 2023 16:21:56 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E5=BA=93=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement/achivChart/index.jsx | 195 ++++++++++--------
 .../achievement/achivChart/index.scss         |   6 +-
 .../achievement/noticeDetail/index.jsx        |   2 +-
 .../achievement/noticeList/index.scss         |   1 +
 4 files changed, 111 insertions(+), 93 deletions(-)

diff --git a/src/military/achievement/achivChart/index.jsx b/src/military/achievement/achivChart/index.jsx
index 802c456d1..d23923ab3 100644
--- a/src/military/achievement/achivChart/index.jsx
+++ b/src/military/achievement/achivChart/index.jsx
@@ -11,103 +11,120 @@ function AchivChart() {
   useEffect(() => {
     // 拿到成果概览数据
     getAchivChart().then(data => {
-        console.log('@@@成果概览数据:',data);
+        // console.log('@@@成果概览数据:',data);
         setAchivData(data);
-    });
-  }, []);
+      });
+    }, []);
 
-  useEffect(() => {
-    if (Object.keys(achivData).length > 0) {
-      // 基于准备好的dom，初始化echarts实例
-      const myChart = echarts.init(document.getElementById('chartBox'));
-      // 计算总成果数量
-      // const keysToExclude = ['viewCount', 'acCount'];
-      // const total = Object.keys(achivData).filter(key => !keysToExclude.includes(key)).reduce((acc, key) => acc + achivData[key], 0);
-      // console.log('@@@总成果数量:',total);
+    useEffect(() => {
+      if (Object.keys(achivData).length > 0) {
+      
+        // 转换函数
+        function preprocessData(data) {
+          return data.map(function(item) {
+            if (item.value === 0) {
+              return {
+                value: null,
+                name: item.name
+              };
+            } else {
+              return item;
+            }
+          });
+        }
 
-      // 指定图表的配置项和数据
-      const option = {
-        title: {
-          text: '成果数量占比统计',
-          left: 'center',
-          top: 380,
-          textStyle: {
-            fontSize: 18
-          }
-        },
-        legend: {
-          orient: 'vertical',
-          right: 10,
-          top: 85,
-          itemGap: 16,
-          itemWidth: 32,
-          itemHeight: 24,
-          textStyle: {
-            fontSize: 16
-          }
-        },
-        color: [
-          'rgba(183, 88, 255, 1)',
-          'rgba(255, 190, 56, 1)',
-          'rgba(240, 68, 95, 1)',
-          'rgba(88, 113, 255, 1)',
-          'rgba(36, 185, 168, 1)',
-          'rgba(88, 183, 255, 1)'
-        ],
-        series: [
-          {
-            name: 'Nightingale Chart',
-            type: 'pie',
-            radius: [35, 160],
-            center: ['150', '50%'],
-            roseType: 'area',
-            clockwise: true,
-            startAngle: 45,
-            label: {
-              show: false
-            },
-            itemStyle: {
-              borderRadius: 0
-            },
-            data: [
-              { value: achivData.osProjectCount, name: '开源项目 ' + achivData.osProjectCount + '%' },
-              { value: achivData.ckTaskCount, name: '创客任务 ' + achivData.ckTaskCount + '%' },
-              { value: achivData.osContestCount, name: '开放竞赛 ' + achivData.osContestCount + '%' },
-              { value: achivData.scienceAchievementCount, name: '科研成果 ' + achivData.scienceAchievementCount + '%' },
-              { value: achivData.equipAchievement, name: '装备成果 ' + achivData.equipAchievement + '%' },
-              { value: achivData.anotherCount, name: '其他成果 ' + achivData.anotherCount + '%' }
-            ],
-            label: {
-              show: true,
-              position: 'inside',
-              color: 'white',
-              formatter: '{c}%', // 显示数据名称和百分比
-              textStyle: {
-                  fontSize: 20
+        // echarts data
+        let data = [
+          { value: achivData.osProjectCount, name: '开源项目 ' + achivData.osProjectCount + '%' },
+          { value: achivData.ckTaskCount, name: '创客任务 ' + achivData.ckTaskCount + '%' },
+          { value: achivData.osContestCount, name: '开放竞赛 ' + achivData.osContestCount + '%' },
+          { value: achivData.scienceAchievementCount, name: '科研成果 ' + achivData.scienceAchievementCount + '%' },
+          { value: achivData.equipAchievement, name: '装备成果 ' + achivData.equipAchievement + '%' },
+          { value: achivData.anotherCount, name: '其他成果 ' + achivData.anotherCount + '%' }
+        ];
+
+        // 按照value从大到小排序
+        let sortedData = data.sort((a, b) => { return b.value - a.value } );
+
+        // 如果传入的数据的value为0 则把0变为null
+        let processedData = preprocessData(sortedData);
+
+        // 初始化echarts实例
+        const myChart = echarts.init(document.getElementById('chartBox'));
+
+        // 指定图表的配置项和数据
+        const option = {
+          title: {
+            text: '成果数量占比统计',
+            left: 215,
+            top: 380,
+            textStyle: {
+              fontSize: 18
+            }
+          },
+          legend: {
+            orient: 'vertical',
+            right: 10,
+            top: 105,
+            itemGap: 16,
+            itemWidth: 32,
+            itemHeight: 24,
+            textStyle: {
+              fontSize: 16
+            }
+          },
+          color: [
+            'rgba(183, 88, 255, 1)',
+            'rgba(255, 190, 56, 1)',
+            'rgba(240, 68, 95, 1)',
+            'rgba(88, 113, 255, 1)',
+            'rgba(36, 185, 168, 1)',
+            'rgba(88, 183, 255, 1)'
+          ],
+          series: [
+            {
+              name: 'Nightingale Chart',
+              type: 'pie',
+              radius: [35, 145],
+              center: ['150', '50%'],
+              roseType: 'area',
+              clockwise: false,
+              startAngle: 45,
+              itemStyle: {
+                borderRadius: 0
+              },
+              data: processedData,
+              label: {
+                show: true,
+                position: 'inside',
+                color: 'white',
+                formatter: '{c}%', // 显示数据名称和百分比
+                textStyle: {
+                    fontSize: 20
+                }
               }
             }
+          ],
+          graphic: {
+            type: 'text',
+            left: '133',
+            top: 'middle',
+            style: {
+              text: '成果\n类型',
+              fill: '#333',
+              fontSize: 18,
+              fontWeight: 'bold',
+              verticalAlign: 'middle',
+              lineHeight: 24
+            }
           }
-        ],
-        graphic: {
-          type: 'text',
-          left: '133',
-          top: 'middle',
-          style: {
-            text: '成果\n类型',
-            fill: '#333',
-            fontSize: 18,
-            fontWeight: 'bold',
-            verticalAlign: 'middle',
-            lineHeight: 24
-          }
-        }
-      };
+        };
 
-      // 使用刚指定的配置项和数据显示图表。
-      myChart.setOption(option);
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
 
-    }
-  }, [achivData]); 
+      }
+    }, [achivData]); 
 
   return (
     <div id='mainContent'>
diff --git a/src/military/achievement/achivChart/index.scss b/src/military/achievement/achivChart/index.scss
index baa5ffaad..f847e3197 100644
--- a/src/military/achievement/achivChart/index.scss
+++ b/src/military/achievement/achivChart/index.scss
@@ -5,10 +5,10 @@
     height: 450px;
     display: flex;
     background:linear-gradient(97.82deg,#f3f5f8 0%,rgba(255, 255, 255, 0) 100%);
-    box-shadow:8px 6px 18px rgba(171, 202, 255, 0.24) inset;
+    box-shadow:0px 6px 18px rgba(171, 202, 255, 0.24) inset;
 
     #leftBox {
-        width: 550px;
+        width: 515px;
         height: 450px; 
         position: relative;
         .count-top {
@@ -117,7 +117,7 @@
         height: 450px;
     }
     #blankBox {
-        width: 150px;
+        width: 185px;
         height: 450px;
     }
 }
diff --git a/src/military/achievement/noticeDetail/index.jsx b/src/military/achievement/noticeDetail/index.jsx
index b19d982ea..e17d1c1e1 100644
--- a/src/military/achievement/noticeDetail/index.jsx
+++ b/src/military/achievement/noticeDetail/index.jsx
@@ -67,7 +67,7 @@ export default Form.create()(({ match, history, showNotification, form }) => {
     <div className="centerbox notice-detail">
       <div className="head-navigation">
         <Link to="/">首页<span className="greater">&nbsp;&gt;&nbsp;</span></Link>
-        <Link to="/achievement">成果库<span className="greater">&nbsp;&gt;&nbsp;</span></Link>
+        <Link to="/achievement/overview">成果库<span className="greater">&nbsp;&gt;&nbsp;</span></Link>
         <span>成果详情</span>
       </div>
       <div className="center-content">
diff --git a/src/military/achievement/noticeList/index.scss b/src/military/achievement/noticeList/index.scss
index c7c23546c..657f726b0 100644
--- a/src/military/achievement/noticeList/index.scss
+++ b/src/military/achievement/noticeList/index.scss
@@ -113,6 +113,7 @@
   margin-top: -20px;
 
   .navigationMenu{
+    margin-top: -12px;
     margin-right: 20px;
     width: 20.8em;
     caret-color: rgba(0, 0, 0, 0);

From aed4df4479e68cfae66efd640c8ea31c7f022e55 Mon Sep 17 00:00:00 2001
From: zhangxzz <zhangxzz@example.org>
Date: Wed, 22 Nov 2023 16:41:58 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=88=90=E6=9E=9C=E5=BA=93=E6=A6=82?=
 =?UTF-8?q?=E8=A7=88=E5=9B=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement/achivChart/index.jsx | 45 +++++++++++++------
 .../achievement/achivChart/index.scss         | 10 ++---
 src/modules/tpm/NewHeader.js                  |  7 +++
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/military/achievement/achivChart/index.jsx b/src/military/achievement/achivChart/index.jsx
index d23923ab3..e96575cdd 100644
--- a/src/military/achievement/achivChart/index.jsx
+++ b/src/military/achievement/achivChart/index.jsx
@@ -21,16 +21,25 @@ function AchivChart() {
       
         // 转换函数
         function preprocessData(data) {
-          return data.map(function(item) {
-            if (item.value === 0) {
-              return {
-                value: null,
-                name: item.name
-              };
-            } else {
-              return item;
+          let hasNonZeroValue = false;
+        
+          for (let i = 0; i < data.length; i++) {
+            if (data[i].value !== 0) {
+              hasNonZeroValue = true;
+              break;
             }
-          });
+          }
+        
+          if (!hasNonZeroValue) {
+            // 如果所有value都为0，则不做任何改变
+            return data;
+          } else {
+            // 部分value为0，则将0变为null
+            return data.map(item => ({
+              ...item,
+              value: item.value === 0 ? null : item.value
+            }));
+          }
         }
 
         // echarts data
@@ -42,6 +51,14 @@ function AchivChart() {
           { value: achivData.equipAchievement, name: '装备成果 ' + achivData.equipAchievement + '%' },
           { value: achivData.anotherCount, name: '其他成果 ' + achivData.anotherCount + '%' }
         ];
+        // let data = [
+        //   { value: 0, name: '开源项目 ' + achivData.osProjectCount + '%' },
+        //   { value: 0, name: '创客任务 ' + achivData.ckTaskCount + '%' },
+        //   { value: 0, name: '开放竞赛 ' + achivData.osContestCount + '%' },
+        //   { value: 0, name: '科研成果 ' + achivData.scienceAchievementCount + '%' },
+        //   { value: 0, name: '装备成果 ' + achivData.equipAchievement + '%' },
+        //   { value: 0, name: '其他成果 ' + achivData.anotherCount + '%' }
+        // ];
 
         // 按照value从大到小排序
         let sortedData = data.sort((a, b) => { return b.value - a.value } );
@@ -57,7 +74,7 @@ function AchivChart() {
           title: {
             text: '成果数量占比统计',
             left: 215,
-            top: 380,
+            top: 385,
             textStyle: {
               fontSize: 18
             }
@@ -65,7 +82,7 @@ function AchivChart() {
           legend: {
             orient: 'vertical',
             right: 10,
-            top: 105,
+            top: 108,
             itemGap: 16,
             itemWidth: 32,
             itemHeight: 24,
@@ -86,7 +103,7 @@ function AchivChart() {
               name: 'Nightingale Chart',
               type: 'pie',
               radius: [35, 145],
-              center: ['150', '50%'],
+              center: ['160', '50%'],
               roseType: 'area',
               clockwise: false,
               startAngle: 45,
@@ -107,10 +124,10 @@ function AchivChart() {
           ],
           graphic: {
             type: 'text',
-            left: '133',
+            left: '142',
             top: 'middle',
             style: {
-              text: '成果\n类型',
+              text: '成果\n来源',
               fill: '#333',
               fontSize: 18,
               fontWeight: 'bold',
diff --git a/src/military/achievement/achivChart/index.scss b/src/military/achievement/achivChart/index.scss
index f847e3197..9d2397c50 100644
--- a/src/military/achievement/achivChart/index.scss
+++ b/src/military/achievement/achivChart/index.scss
@@ -8,7 +8,7 @@
     box-shadow:0px 6px 18px rgba(171, 202, 255, 0.24) inset;
 
     #leftBox {
-        width: 515px;
+        width: 495px;
         height: 450px; 
         position: relative;
         .count-top {
@@ -16,7 +16,7 @@
             width: 190px;
             height: 95px;
             position: absolute;
-            top: 87px;
+            top: 110px;
             right: 130px;
             background:#f7faff;
             box-sizing: border-box;
@@ -66,7 +66,7 @@
             width: 190px;
             height: 95px;
             position: absolute;
-            top: 227px;
+            top: 250px;
             right: 130px;
             background:#f7faff;
             box-sizing: border-box;
@@ -113,11 +113,11 @@
         }
     }
     #chartBox {
-        width: 500px;
+        width: 515px;
         height: 450px;
     }
     #blankBox {
-        width: 185px;
+        width: 190px;
         height: 450px;
     }
 }
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index ecac55f69..4600b258f 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -576,6 +576,7 @@ class NewHeader extends Component {
   }
 
   matchpaths = (url) => {
+    console.log('@@@进入 newhead > matchpaths');
     const { match } = this.props;
     const hostname = window.location.hostname;
     const port = window.location.port;
@@ -596,8 +597,14 @@ class NewHeader extends Component {
 
     // console.log(str, (url + "/"), url && str === url);
     if (url && (str === url || str === (url + "/"))) {
+      console.log('@@@ matchpaths true');
+      console.log('url:',url);
+      console.log('str:',str);
       return true
     } else {
+      console.log('@@@ matchpaths true');
+      console.log('url:',url);
+      console.log('str:',str);
       return false
     }
 

From 850d6187c16c68f22c9deb93c041736734b3caab Mon Sep 17 00:00:00 2001
From: zhangxzz <zhangxzz@example.org>
Date: Thu, 23 Nov 2023 08:34:40 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E6=88=90=E6=9E=9C=E5=BA=93=E4=B8=8D=E6=A0=87=E4=BA=AE?=
 =?UTF-8?q?log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/tpm/NewHeader.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 4600b258f..ed5c841e0 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -594,6 +594,7 @@ class NewHeader extends Component {
     } else {
       str = match.path;
     }
+    console.log(match.path)
 
     // console.log(str, (url + "/"), url && str === url);
     if (url && (str === url || str === (url + "/"))) {
@@ -602,7 +603,7 @@ class NewHeader extends Component {
       console.log('str:',str);
       return true
     } else {
-      console.log('@@@ matchpaths true');
+      console.log('@@@ matchpaths false');
       console.log('url:',url);
       console.log('str:',str);
       return false

From 056f6f5011e62552a5ef8c52628c7775d73933ff Mon Sep 17 00:00:00 2001
From: zhangxzz <zhangxzz@example.org>
Date: Thu, 23 Nov 2023 16:06:37 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=E9=A5=BC=E7=8A=B6=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement.js                   |  6 ++---
 src/military/achievement/achivChart/index.jsx | 25 +++++++++++++------
 src/modules/tpm/NewHeader.js                  | 16 ++++++------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/military/achievement.js b/src/military/achievement.js
index 5b8f84710..56eafe866 100644
--- a/src/military/achievement.js
+++ b/src/military/achievement.js
@@ -60,13 +60,13 @@ class Index extends Component {
             )}
           ></Route>
 
+
           <Route
-            path="/achievement/overview"
+            path="/achievement"
             render={(props) => (
-                <Overview {...this.props} {...props} />
+              <Overview {...this.props} {...props} />
             )}
           ></Route>
-
         </Switch>
       </div>
     );
diff --git a/src/military/achievement/achivChart/index.jsx b/src/military/achievement/achivChart/index.jsx
index e96575cdd..4f072428c 100644
--- a/src/military/achievement/achivChart/index.jsx
+++ b/src/military/achievement/achivChart/index.jsx
@@ -66,11 +66,20 @@ function AchivChart() {
         // 如果传入的数据的value为0 则把0变为null
         let processedData = preprocessData(sortedData);
 
+
         // 初始化echarts实例
         const myChart = echarts.init(document.getElementById('chartBox'));
 
         // 指定图表的配置项和数据
         const option = {
+          "tooltip": {
+            "trigger": "item",
+            "formatter": function(params) {
+                var value = params.value;
+                var name = params.name.substring(0, 4);
+                return "名称：" + name + "<br>占比：" + value + "%";
+            }
+          },
           title: {
             text: '成果数量占比统计',
             left: 215,
@@ -100,16 +109,18 @@ function AchivChart() {
           ],
           series: [
             {
-              name: 'Nightingale Chart',
+              name: '成果数量占比',
               type: 'pie',
-              radius: [35, 145],
+              radius: [45, 145],
               center: ['160', '50%'],
-              roseType: 'area',
               clockwise: false,
               startAngle: 45,
               itemStyle: {
-                borderRadius: 0
+                borderRadius: 10,
+                borderColor: '#fff',
+                borderWidth: 1
               },
+              minShowLabelAngle: 10,
               data: processedData,
               label: {
                 show: true,
@@ -117,7 +128,7 @@ function AchivChart() {
                 color: 'white',
                 formatter: '{c}%', // 显示数据名称和百分比
                 textStyle: {
-                    fontSize: 20
+                    fontSize: 18
                 }
               }
             }
@@ -131,12 +142,12 @@ function AchivChart() {
               fill: '#333',
               fontSize: 18,
               fontWeight: 'bold',
-              verticalAlign: 'middle',
-              lineHeight: 24
+              verticalAlign: 'middle'
             }
           }
         };
 
+        console.log('option',option)
         // 使用刚指定的配置项和数据显示图表。
         myChart.setOption(option);
 
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index ed5c841e0..8d213b25c 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -576,7 +576,7 @@ class NewHeader extends Component {
   }
 
   matchpaths = (url) => {
-    console.log('@@@进入 newhead > matchpaths');
+    // console.log('@@@进入 newhead > matchpaths');
     const { match } = this.props;
     const hostname = window.location.hostname;
     const port = window.location.port;
@@ -594,18 +594,18 @@ class NewHeader extends Component {
     } else {
       str = match.path;
     }
-    console.log(match.path)
+    // console.log(match.path)
 
     // console.log(str, (url + "/"), url && str === url);
     if (url && (str === url || str === (url + "/"))) {
-      console.log('@@@ matchpaths true');
-      console.log('url:',url);
-      console.log('str:',str);
+      // console.log('@@@ matchpaths true');
+      // console.log('url:',url);
+      // console.log('str:',str);
       return true
     } else {
-      console.log('@@@ matchpaths false');
-      console.log('url:',url);
-      console.log('str:',str);
+      // console.log('@@@ matchpaths false');
+      // console.log('url:',url);
+      // console.log('str:',str);
       return false
     }