Merge remote-tracking branch 'origin/master'

48aa3145 · 王晓倩 · 7345816a · f622c5c6 · 48aa3145 · 48aa3145
Commit 48aa3145 authored Feb 22, 2022 by 王晓倩
33 changed files
--- a/gassafetyprogress-web/src/assets/image/bigcz.svg
+++ b/gassafetyprogress-web/src/assets/image/bigcz.svg
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 12C24 18.6274 18.6274 24 12 24C5.37256 24 0 18.6274 0 12C0 5.37259 5.37256 0 12 0C18.6274 0 24 5.37259 24 12ZM11.8157 15.1111H12.7778V19H11.8157V15.1111ZM9.66669 15.1111H10.6288V19H9.66669V15.1111ZM17.9321 5.57088V17.8566H19V19H13.624V14.7354C13.624 14.4204 13.3611 14.1637 13.0391 14.1637H8.80176C8.4798 14.1637 8.21613 14.4212 8.21613 14.7354V19H5V17.8559H6.06787V10.7198C6.07013 10.5664 6.133 10.4202 6.24274 10.3131C6.35248 10.2059 6.50018 10.1466 6.65356 10.1481H10.1209V8.95264C10.1229 8.79916 10.1857 8.65276 10.2955 8.54546C10.4053 8.43817 10.553 8.37875 10.7065 8.3802H12.945C13.0984 8.37875 13.2463 8.43817 13.3561 8.54546C13.4658 8.65276 13.5286 8.79916 13.5306 8.95264V10.1489H14.4609V5.57166C14.4631 5.4183 14.526 5.27209 14.6357 5.16496C14.7455 5.05785 14.8932 4.99854 15.0466 4.99998H17.3464C17.4996 4.99852 17.6472 5.05774 17.757 5.16469C17.8667 5.27165 17.9296 5.41766 17.9321 5.57088ZM8.38879 13.3253H13.4544H13.4575V12.182H8.38879V13.3253Z" fill="#00FFFF"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/bigfmj.svg
+++ b/gassafetyprogress-web/src/assets/image/bigfmj.svg
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.0628 10.251C22.6568 7.40216 21.2748 4.79938 19.1691 2.91753C17.0634 1.03568 14.3743 0.000197346 11.5925 0C8.51794 0 5.56936 1.26428 3.39535 3.51472C1.22134 5.76516 0 8.8174 0 12C0 15.1826 1.22134 18.2348 3.39535 20.4853C5.56936 22.7357 8.51794 24 11.5925 24C14.3743 23.9998 17.0634 22.9643 19.1691 21.0825C21.2748 19.2006 22.6568 16.5978 23.0628 13.749H24.0047V10.251H23.0628ZM2.71191 11.1574C2.902 9.01483 3.80895 7.00827 5.27612 5.48425C6.74329 3.96023 8.67854 3.01445 10.7477 2.81025V4.64212C9.14707 4.83942 7.65761 5.58996 6.52027 6.77232C5.38293 7.95469 4.66424 9.4997 4.48048 11.1574H2.71191ZM10.7477 21.1901C8.68913 20.9869 6.76276 20.0497 5.29802 18.5387C3.83328 17.0277 2.92117 15.0369 2.71771 12.9067H4.48809C4.68476 14.5515 5.40819 16.0805 6.54284 17.2497C7.6775 18.4189 9.15792 19.1607 10.7477 19.3568V21.1901ZM10.4477 12.5093V16.5007H9.02002V7.482H14.9611V8.745H10.4462V11.2459H14.705V12.5089L10.4477 12.5093ZM12.4373 21.1901V19.3579C14.027 19.1618 15.5074 18.42 16.6421 17.2508C17.7767 16.0816 18.5001 14.5526 18.6968 12.9079H20.4672C20.2633 15.0378 19.3511 17.0282 17.8864 18.5388C16.4217 20.0495 14.4955 20.9865 12.4373 21.1898V21.1901ZM18.7044 11.1574C18.5207 9.4997 17.802 7.95469 16.6646 6.77232C15.5273 5.58996 14.0378 4.83942 12.4373 4.64212V2.81025C14.5063 3.01453 16.4415 3.96035 17.9086 5.48436C19.3757 7.00837 20.2826 9.01489 20.4726 11.1574H18.7044Z" fill="#00FFFF"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/bigjk.svg
+++ b/gassafetyprogress-web/src/assets/image/bigjk.svg
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 24C18.6274 24 24 18.6274 24 12C24 5.37258 18.6274 0 12 0C5.37258 0 0 5.37258 0 12C0 18.6274 5.37258 24 12 24ZM3.42381 12.4281C3.19063 12.3305 3 12.4487 3 12.6902V18.7036C3 18.9455 3.19063 19.0629 3.42381 18.9661L5.21764 18.2163C5.45123 18.1191 5.64145 17.8426 5.64145 17.6007V16.6257H9.27615C9.46324 16.6259 9.64647 16.5752 9.80426 16.4796C9.96204 16.3841 10.0878 16.2476 10.1667 16.0864L11.007 14.3597L9.22993 13.5741L8.64903 14.7676H5.64227V13.7927C5.64227 13.5512 5.45163 13.2743 5.21846 13.1771L3.42381 12.4281ZM18.6986 15.2456L19.9238 12.7559L16.9456 14.4709L18.6986 15.2456ZM20.6397 10.4623L8.46412 5.08163C8.24144 4.98377 7.98712 4.97348 7.7565 5.05302C7.52588 5.13255 7.33765 5.29547 7.23278 5.50629L5.11864 9.8035C5.01586 10.0148 5.00534 10.2562 5.08937 10.4748C5.1734 10.6935 5.34514 10.8716 5.567 10.9702L13.5961 14.5184C14.0579 14.7221 14.7918 14.684 15.2271 14.4336L20.6871 11.289C21.1224 11.0386 21.1007 10.6668 20.6397 10.4623Z" fill="#00FFFF"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/bigtyx.svg
+++ b/gassafetyprogress-web/src/assets/image/bigtyx.svg
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 0C8.8174 0 5.76516 1.26428 3.51472 3.51472C1.26428 5.76516 0 8.8174 0 12C0 15.1826 1.26428 18.2348 3.51472 20.4853C5.76516 22.7357 8.8174 24 12 24C15.1826 24 18.2348 22.7357 20.4853 20.4853C22.7357 18.2348 24 15.1826 24 12C24 8.8174 22.7357 5.76516 20.4853 3.51472C18.2348 1.26428 15.1826 0 12 0V0ZM19.2 16.2H18V18H16.2V19.2H13.8V18H10.8V19.2H8.4V18H6.6V16.2H5.4V7.8H6.6V6H8.4V5.4H10.2V6H11.4V5.4H13.2V6H14.4V5.4H16.2V6H18V7.8H19.2V16.2ZM7.2 16.2H17.4V7.2H7.2V16.2ZM16.2 7.8H16.8V15.6H16.2V7.8ZM15 7.8H15.6V15.6H15V7.8ZM13.8 7.8H14.4V15.6H13.8V7.8ZM12.6 7.8H13.2V15.6H12.6V7.8ZM11.4 7.8H12V15.6H11.4V7.8ZM10.2 7.8H10.8V15.6H10.2V7.8ZM9 7.8H9.6V15.6H9V7.8ZM7.8 7.8H8.4V15.6H7.8V7.8Z" fill="#00FFFF"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/biguser.svg
+++ b/gassafetyprogress-web/src/assets/image/biguser.svg
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 12C24 18.6274 18.6274 24 12 24C5.37258 24 0 18.6274 0 12C0 5.37258 5.37258 0 12 0C18.6274 0 24 5.37258 24 12ZM16.1942 9.01682C16.1942 11.314 14.3319 13.1768 12.0343 13.1768C9.7366 13.1768 7.87429 11.3145 7.87429 9.01682C7.87429 6.71962 9.7366 4.85686 12.0343 4.85686C14.3319 4.85686 16.1942 6.71917 16.1942 9.01682ZM12.0343 14.5628C13.2967 14.5628 14.4982 14.1377 15.4676 13.3724V13.3728C17.9836 14.3267 19.1389 17.5964 19.1389 19.0869H4.85717C4.85717 17.583 6.00355 14.2902 8.57023 13.3479C9.54407 14.1279 10.7572 14.5628 12.0343 14.5628Z" fill="#00FFFF"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/quanjing.png
+++ b/gassafetyprogress-web/src/assets/image/quanjing.png
--- a/gassafetyprogress-web/src/assets/image/quanxi.png
+++ b/gassafetyprogress-web/src/assets/image/quanxi.png
--- a/gassafetyprogress-web/src/assets/image/smallcz.svg
+++ b/gassafetyprogress-web/src/assets/image/smallcz.svg
+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.27 12.4812C21.27 16.5018 18.0106 19.7612 13.99 19.7612C9.96936 19.7612 6.70999 16.5018 6.70999 12.4812C6.70999 8.46054 9.96936 5.20117 13.99 5.20117C18.0106 5.20117 21.27 8.46054 21.27 12.4812ZM13.8781 14.3685H14.4618V16.7277H13.8781V14.3685ZM12.5744 14.3685H13.1581V16.7277H12.5744V14.3685ZM17.5888 8.58069V16.034H18.2366V16.7277H14.9752V14.1405C14.9752 13.9494 14.8157 13.7937 14.6203 13.7937H12.0497C11.8543 13.7937 11.6944 13.9499 11.6944 14.1405V16.7277H9.74329V16.0336H10.3911V11.7043C10.3925 11.6113 10.4306 11.5226 10.4972 11.4576C10.5638 11.3926 10.6534 11.3566 10.7464 11.3575H12.85V10.6323C12.8512 10.5392 12.8893 10.4504 12.9559 10.3853C13.0225 10.3202 13.1121 10.2841 13.2053 10.285H14.5632C14.6564 10.2841 14.746 10.3202 14.8126 10.3853C14.8792 10.4504 14.9173 10.5392 14.9185 10.6323V11.358H15.4829V8.58116C15.4843 8.48813 15.5224 8.39943 15.589 8.33444C15.6556 8.26945 15.7452 8.23347 15.8382 8.23435H17.2335C17.3264 8.23346 17.4159 8.26939 17.4825 8.33427C17.5491 8.39916 17.5873 8.48774 17.5888 8.58069ZM11.7991 13.285H14.8723H14.8742V12.5914H11.7991V13.285Z" fill="#00FFFF"/>
+<path d="M7.44824 5.83351C3.83717 9.44459 3.82476 15.2913 7.42591 18.8924C7.81326 19.2798 8.35772 20.0322 8.98153 20.9872C9.59772 21.9305 10.2672 23.0332 10.9036 24.0936C11.0451 24.3294 11.185 24.5632 11.3224 24.7928C11.8004 25.5915 12.247 26.3378 12.6167 26.9281C12.8542 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.4069 28.0941 13.4841 28.1781C13.5225 28.2198 13.5674 28.2648 13.6172 28.3047C13.6581 28.3376 13.7441 28.4018 13.8631 28.4328C14.0424 28.4794 14.1911 28.4243 14.2649 28.3887C14.3444 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7267 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.8909 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6812 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5071 5.81118C16.906 2.21002 11.0593 2.22243 7.44824 5.83351Z" stroke="#00FFFF"/>
+<g filter="url(#filter0_f_159_207)">
+<path d="M14 29L16.598 24.5H11.4019L14 29Z" fill="#00FFFF"/>
+</g>
+<defs>
+<filter id="filter0_f_159_207" x="9.40189" y="22.5" width="9.19617" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_159_207"/>
+</filter>
+</defs>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/smallfmj.svg
+++ b/gassafetyprogress-web/src/assets/image/smallfmj.svg
+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.44827 5.83351C3.8372 9.44459 3.82479 15.2913 7.42594 18.8924C7.81329 19.2798 8.35775 20.0322 8.98156 20.9872C9.59775 21.9305 10.2673 23.0332 10.9036 24.0936C11.0451 24.3294 11.1851 24.5632 11.3224 24.7928C11.8004 25.5915 12.2471 26.3378 12.6167 26.9281C12.8543 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.407 28.0941 13.4842 28.1781C13.5225 28.2198 13.5675 28.2648 13.6172 28.3047C13.6582 28.3376 13.7441 28.4018 13.8631 28.4328C14.0425 28.4794 14.1911 28.4243 14.2649 28.3887C14.3445 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7268 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.891 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6813 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5072 5.81118C16.906 2.21002 11.0594 2.22243 7.44827 5.83351Z" stroke="#00FFFF"/>
+<path d="M21.2167 11.421C20.9613 9.69245 20.0919 8.11321 18.7672 6.97139C17.4425 5.82957 15.7508 5.20129 14.0007 5.20117C12.0665 5.20117 10.2116 5.96828 8.84391 7.33374C7.47624 8.6992 6.70789 10.5512 6.70789 12.4822C6.70789 14.4133 7.47624 16.2652 8.84391 17.6307C10.2116 18.9961 12.0665 19.7632 14.0007 19.7632C15.7508 19.7631 17.4425 19.1348 18.7672 17.993C20.0919 16.8512 20.9613 15.272 21.2167 13.5434L21.27 12.4822L21.2167 11.421ZM8.41395 11.9709C8.53354 10.6709 9.1041 9.45346 10.0271 8.52876C10.9501 7.60405 12.1676 7.0302 13.4693 6.9063V8.01779C12.4623 8.1375 11.5253 8.5929 10.8098 9.3103C10.0943 10.0277 9.64217 10.9651 9.52657 11.9709H8.41395ZM13.4693 18.0583C12.1742 17.935 10.9623 17.3664 10.0409 16.4496C9.11941 15.5328 8.5456 14.3249 8.4176 13.0324H9.53135C9.65507 14.0303 10.1102 14.9581 10.824 15.6675C11.5378 16.3769 12.4691 16.827 13.4693 16.9459V18.0583ZM13.2806 12.7912V15.213H12.3824V9.7409H16.12V10.5072H13.2796V12.0246H15.9588V12.791L13.2806 12.7912ZM14.5322 18.0583V16.9466C15.5323 16.8277 16.4636 16.3775 17.1774 15.6681C17.8912 14.9587 18.3464 14.031 18.4701 13.0331H19.5838C19.4556 14.3254 18.8817 15.5331 17.9602 16.4497C17.0388 17.3663 15.827 17.935 14.5322 18.0583ZM18.4749 11.9709C18.3593 10.9651 17.9071 10.0277 17.1916 9.3103C16.4761 8.5929 15.5391 8.1375 14.5322 8.01779V6.9063C15.8338 7.03025 17.0512 7.60413 17.9742 8.52882C18.8971 9.45352 19.4677 10.671 19.5873 11.9709H18.4749Z" fill="#00FFFF"/>
+<g filter="url(#filter0_f_159_150)">
+<path d="M14 29L16.5981 24.5H11.4019L14 29Z" fill="#00FFFF"/>
+</g>
+<defs>
+<filter id="filter0_f_159_150" x="9.40192" y="22.5" width="9.19617" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_159_150"/>
+</filter>
+</defs>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/smalljk.svg
+++ b/gassafetyprogress-web/src/assets/image/smalljk.svg
+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.99 19.7612C18.0107 19.7612 21.27 16.5018 21.27 12.4812C21.27 8.46054 18.0107 5.20117 13.99 5.20117C9.96939 5.20117 6.71002 8.46054 6.71002 12.4812C6.71002 16.5018 9.96939 19.7612 13.99 19.7612ZM8.78711 12.7408C8.64565 12.6815 8.53 12.7533 8.53 12.8998V16.5479C8.53 16.6946 8.64565 16.7659 8.78711 16.7071L9.87537 16.2523C10.0171 16.1933 10.1325 16.0255 10.1325 15.8788V15.2873H12.3375C12.451 15.2874 12.5622 15.2567 12.6579 15.1987C12.7536 15.1407 12.8299 15.0579 12.8778 14.9601L13.3876 13.9126L12.3095 13.436L11.9571 14.1601H10.133V13.5686C10.133 13.4221 10.0173 13.2541 9.87586 13.1951L8.78711 12.7408ZM18.0538 14.45L18.7971 12.9396L16.9904 13.9801L18.0538 14.45ZM19.2314 11.5482L11.8449 8.2839C11.7098 8.22453 11.5555 8.21829 11.4156 8.26654C11.2757 8.31479 11.1615 8.41362 11.0979 8.54153L9.81531 11.1485C9.75296 11.2767 9.74657 11.4231 9.79755 11.5558C9.84853 11.6884 9.95272 11.7965 10.0873 11.8563L14.9583 14.0088C15.2385 14.1325 15.6837 14.1094 15.9478 13.9574L19.2602 12.0497C19.5242 11.8978 19.5111 11.6722 19.2314 11.5482Z" fill="#00FFFF"/>
+<path d="M7.44827 5.83351C3.8372 9.44459 3.82479 15.2913 7.42594 18.8924C7.81329 19.2798 8.35775 20.0322 8.98156 20.9872C9.59775 21.9305 10.2673 23.0332 10.9036 24.0936C11.0451 24.3294 11.1851 24.5632 11.3224 24.7928C11.8004 25.5915 12.2471 26.3378 12.6167 26.9281C12.8543 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.407 28.0941 13.4842 28.1781C13.5225 28.2198 13.5675 28.2648 13.6172 28.3047C13.6582 28.3376 13.7441 28.4018 13.8631 28.4328C14.0425 28.4794 14.1911 28.4243 14.2649 28.3887C14.3445 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7268 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.891 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6813 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5072 5.81118C16.906 2.21002 11.0594 2.22243 7.44827 5.83351Z" stroke="#00FFFF"/>
+<g filter="url(#filter0_f_159_193)">
+<path d="M14 29L16.5981 24.5H11.4019L14 29Z" fill="#00FFFF"/>
+</g>
+<defs>
+<filter id="filter0_f_159_193" x="9.40192" y="22.5" width="9.19617" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_159_193"/>
+</filter>
+</defs>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/smalltyx.svg
+++ b/gassafetyprogress-web/src/assets/image/smalltyx.svg
+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.99 5.19922C12.0592 5.19922 10.2075 5.96622 8.84225 7.33148C7.47699 8.69675 6.70999 10.5484 6.70999 12.4792C6.70999 14.41 7.47699 16.2617 8.84225 17.627C10.2075 18.9922 12.0592 19.7592 13.99 19.7592C15.9208 19.7592 17.7725 18.9922 19.1377 17.627C20.503 16.2617 21.27 14.41 21.27 12.4792C21.27 10.5484 20.503 8.69675 19.1377 7.33148C17.7725 5.96622 15.9208 5.19922 13.99 5.19922V5.19922ZM18.358 15.0272H17.63V16.1192H16.538V16.8472H15.082V16.1192H13.262V16.8472H11.806V16.1192H10.714V15.0272H9.98599V9.93122H10.714V8.83922H11.806V8.47522H12.898V8.83922H13.626V8.47522H14.718V8.83922H15.446V8.47522H16.538V8.83922H17.63V9.93122H18.358V15.0272ZM11.078 15.0272H17.266V9.56722H11.078V15.0272ZM16.538 9.93122H16.902V14.6632H16.538V9.93122ZM15.81 9.93122H16.174V14.6632H15.81V9.93122ZM15.082 9.93122H15.446V14.6632H15.082V9.93122ZM14.354 9.93122H14.718V14.6632H14.354V9.93122ZM13.626 9.93122H13.99V14.6632H13.626V9.93122ZM12.898 9.93122H13.262V14.6632H12.898V9.93122ZM12.17 9.93122H12.534V14.6632H12.17V9.93122ZM11.442 9.93122H11.806V14.6632H11.442V9.93122Z" fill="#00FFFF"/>
+<path d="M7.44824 5.83351C3.83717 9.44459 3.82476 15.2913 7.42591 18.8924C7.81326 19.2798 8.35772 20.0322 8.98153 20.9872C9.59772 21.9305 10.2672 23.0332 10.9036 24.0936C11.0451 24.3294 11.185 24.5632 11.3224 24.7928C11.8004 25.5915 12.247 26.3378 12.6167 26.9281C12.8542 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.4069 28.0941 13.4841 28.1781C13.5225 28.2198 13.5674 28.2648 13.6172 28.3047C13.6581 28.3376 13.7441 28.4018 13.8631 28.4328C14.0424 28.4794 14.1911 28.4243 14.2649 28.3887C14.3444 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7267 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.8909 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6812 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5071 5.81118C16.906 2.21002 11.0593 2.22243 7.44824 5.83351Z" stroke="#00FFFF"/>
+<g filter="url(#filter0_f_159_195)">
+<path d="M14 29L16.598 24.5H11.4019L14 29Z" fill="#00FFFF"/>
+</g>
+<defs>
+<filter id="filter0_f_159_195" x="9.40189" y="22.5" width="9.19617" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_159_195"/>
+</filter>
+</defs>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/smalluser.svg
+++ b/gassafetyprogress-web/src/assets/image/smalluser.svg
+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.27 12.4812C21.27 16.5018 18.0106 19.7612 13.99 19.7612C9.96936 19.7612 6.70999 16.5018 6.70999 12.4812C6.70999 8.46054 9.96936 5.20117 13.99 5.20117C18.0106 5.20117 21.27 8.46054 21.27 12.4812ZM16.5344 10.671C16.5344 12.0646 15.4046 13.1947 14.0107 13.1947C12.6168 13.1947 11.487 12.0649 11.487 10.671C11.487 9.27734 12.6168 8.14727 14.0107 8.14727C15.4046 8.14727 16.5344 9.27707 16.5344 10.671ZM14.0108 14.0327C14.7766 14.0327 15.5056 13.7748 16.0937 13.3105V13.3108C17.62 13.8895 18.3209 15.8731 18.3209 16.7774H9.65665C9.65665 15.865 10.3521 13.8673 11.9092 13.2957C12.5 13.7689 13.236 14.0327 14.0108 14.0327Z" fill="#00FFFF"/>
+<path d="M7.44824 5.83351C3.83717 9.44459 3.82476 15.2913 7.42591 18.8924C7.81326 19.2798 8.35772 20.0322 8.98153 20.9872C9.59772 21.9305 10.2672 23.0332 10.9036 24.0936C11.0451 24.3294 11.185 24.5632 11.3224 24.7928C11.8004 25.5915 12.247 26.3378 12.6167 26.9281C12.8542 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.4069 28.0941 13.4841 28.1781C13.5225 28.2198 13.5674 28.2648 13.6172 28.3047C13.6581 28.3376 13.7441 28.4018 13.8631 28.4328C14.0424 28.4794 14.1911 28.4243 14.2649 28.3887C14.3444 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7267 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.8909 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6812 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5071 5.81118C16.906 2.21002 11.0593 2.22243 7.44824 5.83351Z" stroke="#00FFFF"/>
+<g filter="url(#filter0_f_159_191)">
+<path d="M14 29L16.598 24.5H11.4019L14 29Z" fill="#00FFFF"/>
+</g>
+<defs>
+<filter id="filter0_f_159_191" x="9.40189" y="22.5" width="9.19617" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_159_191"/>
+</filter>
+</defs>
+</svg>
--- a/gassafetyprogress-web/src/assets/image/weixing.png
+++ b/gassafetyprogress-web/src/assets/image/weixing.png
--- a/gassafetyprogress-web/src/assets/mapinages/bac1.png
+++ b/gassafetyprogress-web/src/assets/mapinages/bac1.png
--- a/gassafetyprogress-web/src/assets/mapinages/background.png
+++ b/gassafetyprogress-web/src/assets/mapinages/background.png
--- a/gassafetyprogress-web/src/assets/mapinages/bottom-banner.png
+++ b/gassafetyprogress-web/src/assets/mapinages/bottom-banner.png
--- a/gassafetyprogress-web/src/assets/mapinages/bottom.png
+++ b/gassafetyprogress-web/src/assets/mapinages/bottom.png
--- a/gassafetyprogress-web/src/assets/mapinages/bottombanner.png
+++ b/gassafetyprogress-web/src/assets/mapinages/bottombanner.png
--- a/gassafetyprogress-web/src/assets/mapinages/changzhan.svg
+++ b/gassafetyprogress-web/src/assets/mapinages/changzhan.svg
+<svg id="组_2445" data-name="组 2445" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 34.049">
+  <path id="路径_169" data-name="路径 169" d="M-2160.2,287.287a9.537,9.537,0,0,1,9.538,9.537,9.537,9.537,0,0,1-9.538,9.537,9.538,9.538,0,0,1-9.537-9.537A9.538,9.538,0,0,1-2160.2,287.287Zm0,1.467a8.069,8.069,0,0,0-8.069,8.07,8.069,8.069,0,0,0,8.069,8.07,8.069,8.069,0,0,0,8.07-8.07A8.069,8.069,0,0,0-2160.2,288.754Zm-.109,1.485a6.691,6.691,0,0,1,6.681,6.68,6.691,6.691,0,0,1-6.681,6.68,6.691,6.691,0,0,1-6.68-6.68A6.691,6.691,0,0,1-2160.309,290.239Zm.144,11.685h-.276v1.1h.276Zm-3.65-1.433-.771.772.2.2.772-.772-.2-.2Zm6.748,0-.2.2.771.772.2-.2Zm-1.874-6.328-1.808,2.094a.671.671,0,0,0-.265.286.825.825,0,0,0,.375,1.081.831.831,0,0,0,1.08-.375.723.723,0,0,0,.089-.375l.529-2.711Z" transform="translate(2171.7 -284.903)" fill="#7bf8f4"/>
+  <g id="路径_188" data-name="路径 188" fill="none">
+    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+    <path d="M 11.5 0.9999980926513672 C 5.71027946472168 0.9999980926513672 1 5.710289001464844 1 11.50002861022949 C 1 15.44052600860596 6.295671463012695 22.62869071960449 11.47669506072998 28.3024730682373 C 12.68497657775879 26.95182228088379 15.33078575134277 23.97880554199219 17.65543937683105 20.72857856750488 C 19.63740921020508 17.95747756958008 22 14.10697841644287 22 11.50002861022949 C 22 5.710289001464844 17.28972053527832 0.9999980926513672 11.5 0.9999980926513672 M 11.5 -1.9073486328125e-06 C 17.85127067565918 -1.9073486328125e-06 23 5.148738861083984 23 11.50002861022949 C 23 17.82768249511719 11.48916530609131 29.63789749145508 11.49940204620361 29.80171585083008 C 11.36462783813477 29.63818168640137 0 17.7873649597168 0 11.50002861022949 C 0 5.148738861083984 5.14872932434082 -1.9073486328125e-06 11.5 -1.9073486328125e-06 Z M 11.49940204620361 29.80171585083008 C 11.50076866149902 29.80337524414062 11.50098419189453 29.8038387298584 11.5 29.80305862426758 C 11.49963855743408 29.80277252197266 11.49944019317627 29.80232810974121 11.49940204620361 29.80171585083008 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_35" data-name="多边形 35" d="M4.524,0,9.049,6.033H0Z" transform="translate(16.59 29.951) rotate(180)" fill="#7bf8f4"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/mapinages/closeBtn.png
+++ b/gassafetyprogress-web/src/assets/mapinages/closeBtn.png
--- a/gassafetyprogress-web/src/assets/mapinages/famen.svg
+++ b/gassafetyprogress-web/src/assets/mapinages/famen.svg
+<svg id="组_2447" data-name="组 2447" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23.304 34.295">
+  <path id="路径_168" data-name="路径 168" d="M-1603.123-57.691a9.445,9.445,0,0,0-9.234-8.255,9.5,9.5,0,0,0-9.333,9.663,9.5,9.5,0,0,0,9.333,9.663,9.445,9.445,0,0,0,9.234-8.255h.76v-2.817Zm-16.383.73a7.312,7.312,0,0,1,6.469-6.722v1.475a5.871,5.871,0,0,0-5.045,5.246Zm6.469,8.079a7.311,7.311,0,0,1-6.465-6.67h1.425a5.869,5.869,0,0,0,5.039,5.2Zm-.242-6.99v3.214h-1.149v-7.262h4.784V-58.9h-3.635v2.014h3.429v1.017Zm1.6,6.99v-1.475a5.869,5.869,0,0,0,5.039-5.2h1.425A7.311,7.311,0,0,1-1611.677-48.883Zm5.045-8.079a5.871,5.871,0,0,0-5.045-5.246v-1.475a7.313,7.313,0,0,1,6.469,6.722Z" transform="translate(1624.104 68.362)" fill="#7bf8f4"/>
+  <g id="路径_185" data-name="路径 185" fill="none">
+    <path d="M11.652,0A11.652,11.652,0,0,1,23.3,11.652c0,6.435-11.75,18.467-11.652,18.545S0,18.087,0,11.652A11.652,11.652,0,0,1,11.652,0Z" stroke="none"/>
+    <path d="M 11.65185546875 0.9999942779541016 C 5.77839469909668 0.9999942779541016 0.9999961853027344 5.778413772583008 0.9999961853027344 11.65188407897949 C 0.9999961853027344 15.65063667297363 6.374073028564453 22.94361305236816 11.62834739685059 28.69588470458984 C 12.84814071655273 27.33243751525879 15.5371789932251 24.3126106262207 17.89928436279297 21.01001358032227 C 19.90856552124023 18.20073509216309 22.3037052154541 14.29677486419678 22.3037052154541 11.65188407897949 C 22.3037052154541 5.778413772583008 17.52530479431152 0.9999942779541016 11.65185546875 0.9999942779541016 M 11.65185546875 -5.7220458984375e-06 C 18.08699607849121 -5.7220458984375e-06 23.3037052154541 5.216724395751953 23.3037052154541 11.65188407897949 C 23.3037052154541 18.06309509277344 11.64087867736816 30.02925682067871 11.65124988555908 30.19523429870605 C 11.5146951675415 30.02953720092773 -3.814697265625e-06 18.02224731445312 -3.814697265625e-06 11.65188407897949 C -3.814697265625e-06 5.216724395751953 5.216714859008789 -5.7220458984375e-06 11.65185546875 -5.7220458984375e-06 Z M 11.65124988555908 30.19523429870605 C 11.65263366699219 30.19691467285156 11.65285301208496 30.19738388061523 11.65185546875 30.19659423828125 C 11.6514892578125 30.19630432128906 11.65128803253174 30.19585609436035 11.65124988555908 30.19523429870605 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_32" data-name="多边形 32" d="M4.53,0l4.53,6.039H0Z" transform="translate(16.306 30.197) rotate(180)" fill="#7bf8f4"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/mapinages/jiankong.svg
+++ b/gassafetyprogress-web/src/assets/mapinages/jiankong.svg
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 34.049">
+  <g id="组_2451" data-name="组 2451" transform="translate(7189 23993)">
+    <g id="路径_188" data-name="路径 188" transform="translate(-7189 -23993)" fill="none">
+      <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+      <path d="M 11.5 0.9999980926513672 C 5.71027946472168 0.9999980926513672 1 5.710289001464844 1 11.50002861022949 C 1 15.44052600860596 6.295671463012695 22.62869071960449 11.47669506072998 28.3024730682373 C 12.68497657775879 26.95182228088379 15.33078575134277 23.97880554199219 17.65543937683105 20.72857856750488 C 19.63740921020508 17.95747756958008 22 14.10697841644287 22 11.50002861022949 C 22 5.710289001464844 17.28972053527832 0.9999980926513672 11.5 0.9999980926513672 M 11.5 -1.9073486328125e-06 C 17.85127067565918 -1.9073486328125e-06 23 5.148738861083984 23 11.50002861022949 C 23 17.82768249511719 11.48916530609131 29.63789749145508 11.49940204620361 29.80171585083008 C 11.36462783813477 29.63818168640137 0 17.7873649597168 0 11.50002861022949 C 0 5.148738861083984 5.14872932434082 -1.9073486328125e-06 11.5 -1.9073486328125e-06 Z M 11.49940204620361 29.80171585083008 C 11.50076866149902 29.80337524414062 11.50098419189453 29.8038387298584 11.5 29.80305862426758 C 11.49963855743408 29.80277252197266 11.49944019317627 29.80232810974121 11.49940204620361 29.80171585083008 Z" stroke="none" fill="#7bf8f4"/>
+    </g>
+    <path id="多边形_35" data-name="多边形 35" d="M4.524,0,9.049,6.033H0Z" transform="translate(-7172.411 -23963.049) rotate(180)" fill="#7bf8f4"/>
+    <path id="路径_1298" data-name="路径 1298" d="M21.1,8.659v7.97l-2.46-.621V13.532l-5.534-1.863V9.8h-.613V8.563l-3.428.807,1.315-1.4-.129-.791c-.1.323-.282.54-.508.573-.476.081-.992-.67-1.154-1.67-.145-.928.065-1.75.484-1.92L7.742,2.577l-.1-.04-1.888.307.016.452,1.3-.21L7.4,5.191l-.694.1L5.168,3.593,5.12,2.327,6.5,2.109l.9-.145.791-.129L16.51.512l.976.371,1.452,2.549L10.025,4.86a3.109,3.109,0,0,1,.21.549L18.2,4.134,18.624,6.8,17.285,8.062l-2.323.508V9.813h-.613v1.242L18.656,12.3V9.2ZM9.323,5.175c-.21.032-.315.411-.25.839s.29.758.5.726.315-.411.25-.839S9.532,5.142,9.323,5.175ZM7.943,8.119l-.411-2.6-.6.1.46,2.864,1.549.96.46-.419Z" transform="translate(-7191.327 -23989.652)" fill="#7bf8f4"/>
+  </g>
+</svg>
--- a/gassafetyprogress-web/src/assets/mapinages/tiaoyaxiang.svg
+++ b/gassafetyprogress-web/src/assets/mapinages/tiaoyaxiang.svg
+<svg id="组_2448" data-name="组 2448" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 33.9">
+  <path id="路径_173" data-name="路径 173" d="M-1877.09-49.461a9.537,9.537,0,0,0-9.537,9.537,9.537,9.537,0,0,0,9.537,9.537,9.537,9.537,0,0,0,9.537-9.537A9.537,9.537,0,0,0-1877.09-49.461Zm5.722,12.875h-.954v1.431h-1.43v.954h-1.907v-.954h-2.384v.954h-1.907v-.954h-1.431v-1.431h-.954v-6.676h.954v-1.431h1.431v-.477h1.431v.477h.953v-.477h1.431v.477h.954v-.477h1.431v.477h1.43v1.431h.954Zm-9.537,0h8.107v-7.153h-8.107Zm7.153-6.676h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.953,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.953,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Z" transform="translate(1888.59 51.845)" fill="#7bf8f4"/>
+  <g id="路径_186" data-name="路径 186" fill="none">
+    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+    <path d="M 11.5 0.9999942779541016 C 5.71027946472168 0.9999942779541016 1 5.710294723510742 1 11.50003433227539 C 1 15.44047451019287 6.295700073242188 22.62868881225586 11.47670364379883 28.30246925354004 C 12.68497562408447 26.95181846618652 15.33078575134277 23.97880172729492 17.65543937683105 20.72857475280762 C 19.63740921020508 17.95747375488281 22 14.10698509216309 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 0.9999942779541016 11.5 0.9999942779541016 M 11.5 -5.7220458984375e-06 C 17.85128021240234 -5.7220458984375e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767868041992 11.48916530609131 29.63789367675781 11.49940204620361 29.80171203613281 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 -5.7220458984375e-06 11.5 -5.7220458984375e-06 Z M 11.49940204620361 29.80171203613281 C 11.50076866149902 29.80337142944336 11.50098419189453 29.80383491516113 11.5 29.80305480957031 C 11.49963855743408 29.80276870727539 11.49944019317627 29.80232429504395 11.49940204620361 29.80171203613281 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_33" data-name="多边形 33" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.803) rotate(180)" fill="#7bf8f4"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/mapinages/titlebg.png
+++ b/gassafetyprogress-web/src/assets/mapinages/titlebg.png
--- a/gassafetyprogress-web/src/assets/mapinages/topbanner.png
+++ b/gassafetyprogress-web/src/assets/mapinages/topbanner.png
--- a/gassafetyprogress-web/src/assets/mapinages/user.svg
+++ b/gassafetyprogress-web/src/assets/mapinages/user.svg
+<svg id="组_2446" data-name="组 2446" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 33.9">
+  <path id="路径_170" data-name="路径 170" d="M-1583.57,295.955a3.719,3.719,0,0,0-3.714,3.713,3.719,3.719,0,0,0,3.714,3.713,3.719,3.719,0,0,0,3.713-3.713,3.719,3.719,0,0,0-3.713-3.713Zm2.287,4.15a.608.608,0,0,1-.437.184h-1.862a.618.618,0,0,1-.621-.621V297.2a.618.618,0,0,1,.621-.621.608.608,0,0,1,.437.184.608.608,0,0,1,.184.437v1.862h1.242a.618.618,0,0,1,.621.621.6.6,0,0,1-.184.425Zm-8.966-5.047a4.143,4.143,0,0,0,4.161,0,4.166,4.166,0,0,0,2.081-3.61,4.161,4.161,0,0,0-4.162-4.161,4.16,4.16,0,0,0-4.161,4.161A4.179,4.179,0,0,0-1590.249,295.058Zm1.724,4.61a4.872,4.872,0,0,1,.391-1.931,5.639,5.639,0,0,1,.54-.966,4.67,4.67,0,0,1-.575.035,5.145,5.145,0,0,1-2.081-.425,5.006,5.006,0,0,1-.943-.517,1.2,1.2,0,0,0-1.345-.011,7.8,7.8,0,0,0-3.414,6.265v.069a.6.6,0,0,0,.6.575h7.92a5.215,5.215,0,0,1-.7-1.161,5.035,5.035,0,0,1-.391-1.931Z" transform="translate(1599.528 -284.903)" fill="#7bf8f4" opacity="0.996"/>
+  <g id="路径_190" data-name="路径 190" fill="none">
+    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+    <path d="M 11.5 1.000003814697266 C 5.71027946472168 1.000003814697266 1 5.710294723510742 1 11.50003433227539 C 1 15.44052124023438 6.295677185058594 22.62869262695312 11.47670078277588 28.30246353149414 C 12.68496322631836 26.95182609558105 15.33070659637451 23.97891044616699 17.65538024902344 20.72865295410156 C 19.63738059997559 17.95753479003906 22 14.10700416564941 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 1.000003814697266 11.5 1.000003814697266 M 11.5 3.814697265625e-06 C 17.85128021240234 3.814697265625e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767677307129 11.48916530609131 29.63790130615234 11.49940204620361 29.80170249938965 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 3.814697265625e-06 11.5 3.814697265625e-06 Z M 11.49940204620361 29.80170249938965 C 11.50076866149902 29.80335998535156 11.50098419189453 29.80382347106934 11.5 29.80304336547852 C 11.49963855743408 29.80275726318359 11.49944019317627 29.80231475830078 11.49940204620361 29.80170249938965 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_37" data-name="多边形 37" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.803) rotate(180)" fill="#7bf8f4"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/mapinages/yalibiao.svg
+++ b/gassafetyprogress-web/src/assets/mapinages/yalibiao.svg
+<svg id="组_2449" data-name="组 2449" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 33.9">
+  <g id="路径_186" data-name="路径 186" fill="none">
+    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
+    <path d="M 11.5 0.9999942779541016 C 5.71027946472168 0.9999942779541016 1 5.710294723510742 1 11.50003433227539 C 1 15.44047451019287 6.295700073242188 22.62868881225586 11.47670364379883 28.30246925354004 C 12.68497562408447 26.95181846618652 15.33078575134277 23.97880172729492 17.65543937683105 20.72857475280762 C 19.63740921020508 17.95747375488281 22 14.10698509216309 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 0.9999942779541016 11.5 0.9999942779541016 M 11.5 -5.7220458984375e-06 C 17.85127067565918 -5.7220458984375e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767868041992 11.48916530609131 29.63789367675781 11.49940204620361 29.80171203613281 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 -5.7220458984375e-06 11.5 -5.7220458984375e-06 Z M 11.49940204620361 29.80171203613281 C 11.50076866149902 29.80337142944336 11.50098419189453 29.80383491516113 11.5 29.80305480957031 C 11.49963855743408 29.80276870727539 11.49944019317627 29.80232429504395 11.49940204620361 29.80171203613281 Z" stroke="none" fill="#7bf8f4"/>
+  </g>
+  <path id="多边形_33" data-name="多边形 33" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.804) rotate(180)" fill="#7bf8f4"/>
+  <path id="路径_966" data-name="路径 966" d="M99.476,156.616a6.028,6.028,0,0,1-1.622,2.267.9.9,0,0,1-.583.252.8.8,0,0,1-.567-.236.765.765,0,0,1-.236-.535.705.705,0,0,1,.236-.535,6.035,6.035,0,0,0,1.748-4.377A5.726,5.726,0,0,0,96.7,149.2a6.645,6.645,0,0,0-9.085.016,5.836,5.836,0,0,0-1.763,4.283,6.134,6.134,0,0,0,1.952,4.346.765.765,0,0,1,.236.535.705.705,0,0,1-.236.535.748.748,0,0,1-.567.236.8.8,0,0,1-.567-.236,7.414,7.414,0,0,1-2.047-2.724,7.528,7.528,0,0,1,1.748-8.266,7.836,7.836,0,0,1,2.629-1.685,9.392,9.392,0,0,1,6.361-.063,6.113,6.113,0,0,1,2.141,1.26c2.866,2.425,3.023,5.9,2.047,8.943Zm-7.337-7.684a4.366,4.366,0,0,0-4.377,4.267.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,5.254,5.254,0,0,1,1.575-3.684,5.533,5.533,0,0,1,7.7,0,5.208,5.208,0,0,1,1.606,3.732.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,4.382,4.382,0,0,0-4.424-4.314Zm.913,5.4a1.113,1.113,0,0,1-1.559-.047,1.054,1.054,0,0,1-.268-1.149l-1.212-1.2a.418.418,0,0,1,0-.6.479.479,0,0,1,.63,0l1.228,1.2a1.162,1.162,0,0,1,1.2.268,1.024,1.024,0,0,1,.331.771A1.093,1.093,0,0,1,93.052,154.333Zm.016-.016" transform="translate(-80.582 -142.727)" fill="#7bf8f4"/>
+</svg>
--- a/gassafetyprogress-web/src/assets/mapinages/ylbWran.png
+++ b/gassafetyprogress-web/src/assets/mapinages/ylbWran.png
--- a/gassafetyprogress-web/src/components/bigWindow/PipeColor.vue
+++ b/gassafetyprogress-web/src/components/bigWindow/PipeColor.vue
@@ -10,26 +10,73 @@
  <div>
    <div class="pipePressure">
      <!-- <div>管道压力</div> -->
-      <div class="hasColorBox" :style="{ color: pipeColor[`1`] }">
-        <div :style="{ backgroundColor: pipeColor[`1`] }"></div>
-        低压
-      </div>
-      <div class="hasColorBox" :style="{ color: pipeColor[`2`] }">
-        <div :style="{ backgroundColor: pipeColor[`2`] }"></div>
-        中压
+
+      <div style="float: left;margin-right: 5px;">
+        <div class="hasColorBox">
+          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
+          <img src="../../assets/image/bigtyx.svg" alt="">
+          调压箱
+        </div>
+        <div class="hasColorBox">
+          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
+          <img src="../../assets/image/bigfmj.svg" alt="">
+          阀门井
+        </div>
+        <div class="hasColorBox">
+          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
+          <img src="../../assets/image/bigcz.svg" alt="">
+          厂站
+        </div>
+        <div class="hasColorBox">
+          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
+          <img src="../../assets/image/biguser.svg" alt="">
+          用户
+        </div>
+        <div class="hasColorBox">
+          <!-- <div :style="{ backgroundColor: pipeColor[`4`] }"></div> -->
+          <img src="../../assets/image/bigjk.svg" alt="">
+          监控
+        </div>
      </div>
-      <div class="hasColorBox" :style="{ color: pipeColor[`3`] }">
-        <div :style="{ backgroundColor: pipeColor[`3`] }"></div>
-        次高压
+      <div>
+        <div class="hasColorBox" :style="{ color: pipeColor[`1`] }">
+          <div :style="{ backgroundColor: pipeColor[`1`] }"></div>
+          低压管线
+        </div>
+        <div class="hasColorBox" :style="{ color: pipeColor[`2`] }">
+          <div :style="{ backgroundColor: pipeColor[`2`] }"></div>
+          中压管线
+        </div>
+        <div class="hasColorBox" :style="{ color: pipeColor[`3`] }">
+          <div :style="{ backgroundColor: pipeColor[`3`] }"></div>
+          次高压管线
+        </div>
+        <div class="hasColorBox" :style="{ color: pipeColor[`4`] }">
+          <div :style="{ backgroundColor: pipeColor[`4`] }"></div>
+          高压管线
+        </div>
      </div>
-      <div class="hasColorBox" :style="{ color: pipeColor[`4`] }">
-        <div :style="{ backgroundColor: pipeColor[`4`] }"></div>
-        高压
      </div>
-    </div>
+
    <div class="mapChange">
-      <div :class="{ active: !mapStyle }" @click="mapChange(1)">卫星地图</div>
-      <div :class="{ active: mapStyle }" @click="mapChange(2)">全景地图</div>
+      <div class="qiehuan" @mouseover="hover = true" @mouseleave="hover = false">
+        <img class="divfirst" src="../../assets/image/quanjing.png" alt="">
+        <div class="mapqh1">地图切换</div>
+        <transition name="show">
+          <div v-if="hover" class="qiehuanlog">
+            <div :class="{ active: !mapStyle }" @click="mapChange(1)">
+              <img src="../../assets/image/weixing.png" alt="">
+              <div class="mapqh2">卫星</div>
+            </div>
+            <div :class="{ active: mapStyle }" @click="mapChange(2)">
+              <img class="divsecond" src="../../assets/image/quanxi.png" alt="">
+              <div class="mapqh3">全景</div>
+            </div>
+          </div>
+        </transition>
+
+
+      </div>
    </div>
  </div>
 </template>
@@ -38,32 +85,38 @@
 import { pipeColor } from "@/utils/mapClass/config.js";
 export default {
  data() {
-    return {
-      pipeColor,
-      mapStyle:true
-    };
-  },
-  methods: {
-    // 更改卫星图
-    mapChange(num) {
-      if (num == 1) {
-        this.mapStyle = false;
-      } else {
-        this.mapStyle = true;
-      }
-      this.$parent.map.changeMap(this.mapStyle);
+      return {
+        pipeColor,
+        mapStyle:true,
+        hover:false
+      };
+    },
+    methods: {
+      // 更改卫星图
+      mapChange(num) {
+        if (num == 1) {
+          this.mapStyle = false;
+        } else {
+          this.mapStyle = true;
+        }
+        this.$parent.map.changeMap(this.mapStyle);
+      },
    },
-  },
 };
 </script>

 <style lang="scss" scoped>
 .pipePressure {
+  width: 180px;
+  height: auto;
+  border: 1px solid #a5a5a5;
+  background-color: #112238b3;
  position: fixed;
-  color: #fff;
+  color: rgb(205, 219, 228);
  left: 460px;
-  top: 120px;
-  padding: 1px;
+  bottom: 20px;
+  padding: 5px;
+  font-size: 14px;
  // background: rgba(6, 29, 51, 0.8);
  .hasColorBox {
    // border: 1px solid #053b6a;
@@ -76,22 +129,112 @@ export default {
    }
  }
 }
+.hasColorBox>img{
+  width: 14px;
+}
 .mapChange {
  left: 460px;
  top: 76px;
  color: #fff;
+  padding: 5px;
  position: absolute;
  display: flex;
  div {
-    padding: 4px 8px;
-    border: 1px solid #fff;
-    margin-left: 8px;
    cursor: pointer;
-    &.active,
-    &:hover {
-      background-color: #053b6a;
-      color: #31eaea;
+    &.active
+    {
+      .mapqh2{
+        color: #fff;
+        background: #09f;
+      }
+      .mapqh3{
+        color: #fff;
+        background: #09f;
+      }
+    }
+  }
+}
+.qiehuan{
+  height: 40px;
+  display: block;
+  float: right;
+  &:hover{
+    .divfirst{
+      display: none;
+    }
+    .mapqh1{
+      display: none;
+    }
+    .qiehuanlog{
+      padding: 3px 3px 3px 3px;
+      img{
+        height: 34px;
+      }
+      background-color: #bac7d0;
    }
  }
 }
-</style>
\ No newline at end of file
+
+.qiehuan img{
+  width: 70px;
+  height: 40px;
+}
+.divsecond{
+  margin-left: 8px;
+}
+.qiehuanlog{
+  display: flex;
+  float: right;
+  height: 100%;
+  margin-left: 8px;
+}
+.mapqh1{
+  position: fixed;
+  margin-top: -23px;
+  font-size: 14px;
+  color: #838280;
+  background-color: #fff;
+}
+.mapqh2{
+  position: fixed;
+  margin-top: -23px;
+  font-size: 14px;
+  color: #838280;
+  background-color: #fff;
+}
+.mapqh3{
+  position: fixed;
+  margin-top: -23px;
+  font-size: 14px;
+  color: #838280;
+  background-color: #fff;
+  margin-left: 8px;
+}
+@keyframes show {
+    0%{
+        transform: translateX(-10%);
+        opacity: 0;
+    }
+    100%{
+        transform: translateX(0);
+    }
+}
+@keyframes hide {
+    0%{
+        transform: translateX(0)
+    }
+    100%{
+        transform: translateX(-100%)
+    }
+}
+
+.show-enter-active {
+      animation: show 0.6s;
+  }
+  .show-leave-active {
+      animation: hide 0.6s;
+  }
+  .show-enter, .show-leave-to {
+      opacity: 0;
+  }
+</style>
--- a/gassafetyprogress-web/src/components/bigWindow/leftBar.vue
+++ b/gassafetyprogress-web/src/components/bigWindow/leftBar.vue
@@ -16,7 +16,7 @@
        <span class="dot">
          <span class="dot-inner"></span>
        </span>
-        <span>安全监管</span>
+        <span style="letter-spacing :3px;color:#cddbe4">安全监管</span>
        <div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div> 
        <div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div> 
        <div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div> 
@@ -29,13 +29,13 @@
          <span class="dot">
            <span class="dot-inner"></span>
          </span>
-          <span>任务完成率</span>
+          <span style="letter-spacing :3px;color:#cddbe4">任务完成率</span>
          <div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div> 
          <div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div> 
          <div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div> 
        </div>
      </div>
-      <div id="myCharttwo" :style="{width: '450px', height: '300px'}"></div>
+      <div id="myCharttwo" :style="{width: '450px', height: '270px'}"></div>
      <div class="titleTex" style="height: 20px;margin-top: 0px;font-size: 15px;">
        ● 已完成数量:{{datanow.renwu[1]}}
      </div>
@@ -133,7 +133,7 @@
                    legend: {
                        top:20,
                        textStyle:{
-                            color:"#fff"
+                            color:"#cddbe4"
                        },
                    },
                    
@@ -167,7 +167,7 @@
                            show:true,
                            lineStyle:{
                                type:"dashed",
-                                color: '#bbb6b6',
+                                color:"#bbb6b6"
                            }
                        },
                        type: 'value'
@@ -177,19 +177,46 @@
                            name:"事故数量",
                            data: data.shigu1,
                            type: 'line',
-                            smooth: true
+                            smooth: true,
+                            areaStyle: {
+                                normal: {
+                                    // 渐变填充色（线条下半部分）
+                                    color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                        { offset: 0, color: "#5470c6" },
+                                        { offset: 1, color: "#5470c600" }
+                                    ])
+                                }
+                            }
                        },
                        {
                            data: data.shigu2,
                            type: 'line',
                            smooth: true,
-                            name:"隐患整治数"
+                            name:"隐患整治数",
+                            areaStyle: {
+                                normal: {
+                                    // 渐变填充色（线条下半部分）
+                                    color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                        { offset: 0, color: "#91cc75" },
+                                        { offset: 1, color: "#91cc7500" }
+                                    ])
+                                }
+                            }
                        },
                        {
                            data: data.shigu3,
                            type: 'line',
                            smooth: true,
-                            name:"预警数量"
+                            name:"预警数量",
+                            areaStyle: {
+                                normal: {
+                                    // 渐变填充色（线条下半部分）
+                                    color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                        { offset: 0, color: "#e7bc5e" },
+                                        { offset: 1, color: "#e7bc5e00" }
+                                    ])
+                                }
+                            }
                        }
                    ]
                });
@@ -215,7 +242,7 @@
              {
                name: '任务概况',
                type: 'pie',
-                radius: '70%',
+                radius: '60%',
                center: ['50%','58%'],
                data: [
                  { 
@@ -229,9 +256,37 @@
                    itemStyle: { color: '#00ffff' }
                  },
                ],
+                labelLine:{
+                        length:20,
+                        length2:50,
+                    },
                  label:{
                    color:'#fff',
-                      fontSize: 18
+                      fontSize: 14,
+                      // formatter:"{b}\n\n",
+                      // padding:[0,-55],
+                      normal: {
+                        show: true,
+                        position: 'outer',
+                        // formatter: '{d}%, {c} \n\n',
+                        //模板变量有 {a}, {b}，{c}，{d}，{e}，分别表示系列名，数据名，数据值等。
+                        formatter: "{a_set|{b}}\n{b_set|{d}%}\n\n\n",
+                        // formatter: "{a_set|{b}}\n{c_set|{d}%}\n{b|}\n\n",
+                        borderWidth: 20,
+                        borderRadius: 4,
+                        padding: [0, -55],
+                        rich: {
+                            a_set: {
+                                color: "#fff",
+                                lineHeight: 20,
+                                align: "center",
+                                padding: [55, -40, -15, -40],
+                            },
+                            b_set:{
+                                color: "auto",
+                            },
+                        }
+                      }
                  },
                emphasis: {
                  itemStyle: {
@@ -268,7 +323,7 @@
    font-weight: 700;
    font-style: italic;
    margin-left: 10px;
-    background-image: linear-gradient(to left, #122033, rgb(51 152 243 / 50%) 50%, #111a22);
+    background-image: linear-gradient(to left, #122033, rgb(49 151 195 / 70%) 50%, #111a22);
 }
 .dot {
        display: inline-block;

--- a/gassafetyprogress-web/src/components/bigWindow/rightBar.vue
+++ b/gassafetyprogress-web/src/components/bigWindow/rightBar.vue
--- a/gassafetyprogress-web/src/utils/mapClass/config.js
+++ b/gassafetyprogress-web/src/utils/mapClass/config.js
@@ -20,11 +20,11 @@ export const pipePressure = {
  4: "高压",
 };
 export const svgUrl = {
-  2: require("@/assets/mapImages/tiaoyaxiang.svg"),
-  3: require("@/assets/mapImages/famen.svg"),
-  4: require("@/assets/mapImages/changzhan.svg"),
-  5: require("@/assets/mapImages/jiankong.svg"),
-  6: require("@/assets/mapImages/user.svg"),
+  2: require("@/assets/image/smalltyx.svg"),
+  3: require("@/assets/image/smallfmj.svg"),
+  4: require("@/assets/image/smallcz.svg"),
+  5: require("@/assets/image/smalljk.svg"),
+  6: require("@/assets/image/smalluser.svg"),
 };
 export const deviceType = {
  1:"管道",

--- a/gassafetyprogress-web/src/views/bigWindow/index.vue
+++ b/gassafetyprogress-web/src/views/bigWindow/index.vue
@@ -14,7 +14,7 @@
    <PipeColor />
    <div class="home-div">
      <img
-        src="@/assets/mapImages/bottom.png"
+        src="@/assets/mapinages/bottombanner.png"
        alt=""
        style="width: 100%; height: 100%; z-index: 999"
      />
@@ -48,22 +48,7 @@
    <!-- 头部 -->
    <div class="banner-test">
      <!-- <dv-decoration-5 style="width:100%;height:100%;" /> -->
-      <img src="@/assets/mapImages/top-banner.png" alt="" />
-      <div
-        style="
-          color: #fff;
-          width: 100%;
-          text-align: center;
-          font-weight: 700;
-          font-size: 32px;
-          position: fixed;
-          top: 0;
-          margin-top: 10px;
-          font-family: Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif;
-        "
-      >
-        <span class="tttt" style="">智慧管网安全监管平台</span>
-      </div>
+      <img src="@/assets/mapinages/topbanner.png" alt="" />
    </div>

    <!-- 左边 -->
@@ -92,7 +77,7 @@
      <!-- <iframe src="../../static/weather.html" frameborder="0"></iframe> -->
      <iframe
        scrolling="no"
-        src="https://yiketianqi.com/api.php?style=ty&skin=pitaya&color=fff"
+        src="https://yiketianqi.com/api.php?style=ty&skin=pitaya&color=a8a5a5"
        frameborder="0"
        width="200"
        height="55"
@@ -113,7 +98,7 @@
        z-index: 999;
        width: 190px;
        height: 50px;
-        color: #fff;
+        color: #a8a5a5;
      "
    >
      <div style="height: 50px; width: 49%; float: right; font-size: 14px">
@@ -336,7 +321,7 @@ export default {
 }
 .banner-test {
  width: 100%;
-  height: 70px;
+  height: 85px;
  position: relative;
  top: 0;
  z-index: 999;
@@ -375,37 +360,42 @@ export default {
  );
 }
 .home-div {
-  width: 70%;
+  width: 50%;
  height: 70px;
  position: fixed;
  bottom: 0;
-  margin-left: 15%;
+  margin-left: 25%;
  z-index: 1000;
 }
 .listingsSty {
-  // width: 24%;
  /* height: 25px; */
  position: fixed;
  /* border: 1px solid #fff; */
  bottom: 0;
  margin-bottom: 10px;
-  left: 37%;
+  width: 30%;
+  margin-left: 10%;
+    // font-family: 'arialbd';
 }
 .firsty {
-  width: 90px;
+  width: 15%;
  height: 35px;
  text-align: center;
  line-height: 35px;
  /* border: 1px solid #fff; */
  color: #fff;
-  font-size: 17px;
+  font-size: 16px;
  float: left;
-  margin-left: 20px;
+  margin-left: 8%;
  cursor: pointer;
+  // font-family: 'arialbd';
 }
 .active {
-  text-shadow: 0 0 10px #2ee7e7, 0 0 10px #2ee7e7, 0 0 15px #2ee7e7,
-    0 0 20px #2ee7e7;
+  color: #2ee7e7;
+  background: url(../../assets/mapinages/background.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  font-size: 18px;

  /*position:relative;*/
  /*&::after{
@@ -441,4 +431,4 @@ export default {
  -webkit-background-clip: text;
  -webkit-text-fill-color: transparent;
 }
-</style>
\ No newline at end of file
+</style>