module-menu 0.1.5 → 0.1.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "module-menu",
-  "version": "0.1.5",
-  "description": "城市大数据平台菜单",
+  "version": "0.1.7",
+  "description": "城市大数据平台公共头部及尾部",
   "main":"src/pages/index.jsx",
   "scripts": {
     "start": "umi dev",

package/src/assets/ic_gonggongmokuai_m.svg

@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_gonggongmokuai_m">
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.39246 3.32123C5.39246 4.1611 4.89258 4.88421 4.17411 5.20927L4.17411 8.8039H4.95952C5.27622 6.69742 6.94114 5.03238 9.04757 4.71552V2.46848H14.3479C14.673 1.75 15.3961 1.25011 16.236 1.25011C17.3799 1.25011 18.3072 2.17743 18.3072 3.32134C18.3072 4.46525 17.3799 5.39257 16.236 5.39257C15.3041 5.39257 14.5159 4.77713 14.2558 3.93052H10.5096V4.71552C12.6159 5.03235 14.2808 6.69719 14.5976 8.80349H16.8451L16.8451 14.2554C17.6917 14.5155 18.3072 15.3037 18.3072 16.2355C18.3072 17.3795 17.3799 18.3068 16.236 18.3068C15.092 18.3068 14.1647 17.3795 14.1647 16.2356C14.1647 15.3957 14.6646 14.6726 15.3831 14.3475L15.3831 10.2655H14.5976C14.2808 12.3719 12.6159 14.0367 10.5096 14.3536V16.601L5.20928 16.601C4.88422 17.3194 4.1611 17.8193 3.32123 17.8193C2.17732 17.8193 1.25 16.892 1.25 15.7481C1.25 14.6042 2.17732 13.6769 3.32123 13.6769C4.25313 13.6769 5.04128 14.2923 5.30142 15.1389L9.04758 15.1389V14.3536C6.9414 14.0367 5.27662 12.3721 4.95964 10.2659H2.71207V5.30143C1.86545 5.0413 1.25 4.25314 1.25 3.32123C1.25 2.17732 2.17732 1.25 3.32123 1.25C4.46514 1.25 5.39246 2.17732 5.39246 3.32123ZM11.8903 11.6465V12.1744H7.66657V11.6465C7.66657 11.2964 7.80563 10.9607 8.05316 10.7132C8.30069 10.4656 8.63642 10.3266 8.98648 10.3266H10.5704C10.9204 10.3266 11.2561 10.4656 11.5037 10.7132C11.7512 10.9607 11.8903 11.2964 11.8903 11.6465ZM10.3845 9.67806C10.1924 9.75765 9.98641 9.79862 9.77842 9.79862C9.35835 9.79862 8.95548 9.63175 8.65844 9.33471C8.36141 9.03768 8.19453 8.63481 8.19453 8.21474C8.19453 7.79467 8.36141 7.3918 8.65844 7.09477C8.95548 6.79773 9.35835 6.63086 9.77842 6.63086C9.98641 6.63086 10.1924 6.67183 10.3845 6.75143C10.5767 6.83102 10.7513 6.94769 10.8984 7.09477C11.0455 7.24184 11.1621 7.41645 11.2417 7.60862C11.3213 7.80078 11.3623 8.00674 11.3623 8.21474C11.3623 8.42274 11.3213 8.6287 11.2417 8.82087C11.1621 9.01303 11.0455 9.18764 10.8984 9.33471C10.7513 9.48179 10.5767 9.59846 10.3845 9.67806Z" fill="#4091F7"/>
+</g>
+</svg>

package/src/assets/ic_gonggongmokuai_s.svg

@@ -0,0 +1,50 @@
+<svg width="33" height="33" viewBox="0 0 33 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_gonggongmokuai_s">
+<g id="Frame 427319124">
+<g id="Vector">
+<path d="M4.80005 5.99999C4.80005 5.33725 5.33731 4.79999 6.00005 4.79999H17.6C17.6 6.12547 16.5255 7.19999 15.2 7.19999H6.00005C5.33731 7.19999 4.80005 6.66273 4.80005 5.99999Z" fill="#4091F7"/>
+<path d="M16.4 17.6C15.7373 17.6 15.2 17.0627 15.2 16.4V7.19999C15.2 5.87451 16.2746 4.79999 17.6 4.79999V16.4C17.6 17.0627 17.0628 17.6 16.4 17.6Z" fill="#4091F7"/>
+</g>
+<circle id="Ellipse 995" cx="5.80015" cy="6.19999" r="3.4" fill="#00F1E3"/>
+</g>
+<g id="Frame 427319125">
+<g id="Vector_2">
+<path d="M26.8 4.80005C27.4627 4.80005 28 5.33731 28 6.00005V17.6C26.6745 17.6 25.6 16.5255 25.6 15.2V6.00005C25.6 5.33731 26.1372 4.80005 26.8 4.80005Z" fill="#4091F7"/>
+<path d="M15.2 16.4C15.2 15.7373 15.7372 15.2 16.4 15.2L25.6 15.2C26.9254 15.2 28 16.2746 28 17.6L16.4 17.6C15.7372 17.6 15.2 17.0628 15.2 16.4Z" fill="#4091F7"/>
+</g>
+<circle id="Ellipse 995_2" cx="27.0001" cy="6.19999" r="3.4" transform="rotate(90 27.0001 6.19999)" fill="#00F1E3"/>
+</g>
+<g id="Frame 427319126">
+<g id="Vector_3">
+<path d="M28 26.8C28 27.4627 27.4627 28 26.8 28L15.2 28C15.2 26.6745 16.2745 25.6 17.6 25.6H26.7999C27.4627 25.6 28 26.1372 28 26.8Z" fill="#4091F7"/>
+<path d="M16.4 15.2C17.0627 15.2 17.6 15.7372 17.6 16.4L17.6 25.5999C17.6 26.9254 16.5254 28 15.2 28L15.2 16.4C15.2 15.7372 15.7372 15.2 16.4 15.2Z" fill="#4091F7"/>
+</g>
+<circle id="Ellipse 995_3" cx="27.0001" cy="26.6" r="3.4" transform="rotate(-180 27.0001 26.6)" fill="#00F1E3"/>
+</g>
+<g id="Frame 427319127">
+<g id="Vector_4">
+<path d="M6.00005 28C5.33731 28 4.80005 27.4627 4.80005 26.8L4.80005 15.2C6.12553 15.2 7.20005 16.2745 7.20005 17.6L7.20005 26.8C7.20005 27.4627 6.66279 28 6.00005 28Z" fill="#4091F7"/>
+<path d="M17.6 16.4C17.6 17.0627 17.0628 17.6 16.4 17.6L7.20005 17.6C5.87457 17.6 4.80005 16.5254 4.80005 15.2L16.4 15.2C17.0628 15.2 17.6 15.7372 17.6 16.4Z" fill="#4091F7"/>
+</g>
+<circle id="Ellipse 995_4" cx="5.80015" cy="27.4" r="3.4" transform="rotate(-90 5.80015 27.4)" fill="#00F1E3"/>
+</g>
+<g id="Frame 427319129">
+<circle id="Ellipse 996" cx="16.4001" cy="16.4" r="8" fill="url(#paint0_linear_1958_113340)"/>
+<circle id="Ellipse 997" cx="16.4001" cy="16.4" r="8" fill="#4091F7"/>
+<g id="remix-icons/fill/user/user-3-fill" clip-path="url(#clip0_1958_113340)">
+<g id="Group">
+<path id="Vector_5" d="M19.8667 20.7332H12.9333V19.8665C12.9333 19.2919 13.1616 18.7408 13.568 18.3344C13.9743 17.9281 14.5254 17.6998 15.1 17.6998H17.7C18.2747 17.6998 18.8258 17.9281 19.2321 18.3344C19.6384 18.7408 19.8667 19.2919 19.8667 19.8665V20.7332ZM16.4 16.8332C16.0586 16.8332 15.7205 16.7659 15.405 16.6353C15.0896 16.5046 14.803 16.3131 14.5615 16.0717C14.3201 15.8302 14.1286 15.5436 13.9979 15.2282C13.8673 14.9127 13.8 14.5746 13.8 14.2332C13.8 13.8917 13.8673 13.5536 13.9979 13.2382C14.1286 12.9228 14.3201 12.6361 14.5615 12.3947C14.803 12.1533 15.0896 11.9618 15.405 11.8311C15.7205 11.7004 16.0586 11.6332 16.4 11.6332C17.0896 11.6332 17.7509 11.9071 18.2385 12.3947C18.7261 12.8823 19 13.5436 19 14.2332C19 14.9227 18.7261 15.5841 18.2385 16.0717C17.7509 16.5592 17.0896 16.8332 16.4 16.8332Z" fill="#00F1E3"/>
+</g>
+</g>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1958_113340" x1="16.4001" y1="8.40003" x2="16.4001" y2="24.4" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83E9FF"/>
+<stop offset="1" stop-color="#4C9EF2"/>
+</linearGradient>
+<clipPath id="clip0_1958_113340">
+<rect width="10.4" height="10.4" fill="white" transform="translate(11.2 11.2001)"/>
+</clipPath>
+</defs>
+</svg>

package/src/assets/ic_shujuhuiju_m.svg

@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujuhuiju_m">
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M18.7367 1.74843C18.7367 1.47255 18.513 1.2489 18.2371 1.2489H13.2528C12.9769 1.2489 12.7532 1.47255 12.7532 1.74843V4.65844L11.3163 2.17003C11.1892 1.94989 10.9077 1.87446 10.6876 2.00156L6.30293 4.53302C6.08279 4.66012 6.00737 4.94161 6.13447 5.16176L7.51035 7.54486L5.08293 6.14341C4.86279 6.01631 4.58129 6.09173 4.4542 6.31187L1.92274 10.6965C1.79564 10.9166 1.87106 11.1981 2.0912 11.3252L4.5681 12.7552H1.70685C1.45265 12.7552 1.24658 12.9613 1.24658 13.2155L1.24658 18.2784C1.24658 18.5326 1.45265 18.7387 1.70685 18.7387L15.0731 18.7387C15.7848 18.9027 16.5579 18.8081 17.2403 18.4142C18.2097 17.8545 18.7473 16.8342 18.7365 15.7894C18.7359 15.8389 18.7342 15.8884 18.7311 15.9379C18.7349 15.8758 18.7368 15.8138 18.7367 15.7519L18.7367 15.7473V1.74843ZM12.7532 4.65844L14 6.81791V2.99997H17.5V12.8801L18.0637 13.8565C17.9592 13.7284 17.8442 13.6091 17.7202 13.5L17.4106 12.9489L14 11V6.87779L12.7532 4.65844ZM5.04208 7.63139C5.16918 7.41125 5.45068 7.33582 5.67082 7.46292L13.6343 12.0607C13.8545 12.1878 13.9299 12.4692 13.8028 12.6894L12.1204 15.6034C11.9933 15.8236 11.7118 15.899 11.4916 15.7719L3.52813 11.1742C3.30799 11.0471 3.23256 10.7656 3.35966 10.5454L5.04208 7.63139ZM14.134 15.6317C14.134 16.4579 14.8037 17.1276 15.6299 17.1276C16.456 17.1276 17.1257 16.4579 17.1257 15.6317C17.1257 14.8056 16.456 14.1359 15.6299 14.1359C14.8037 14.1359 14.134 14.8056 14.134 15.6317ZM11.031 4.00009L7.99986 5.75009L9.8261 8.91323L12.9999 10.5001V7.50009L11.031 4.00009ZM3 17L3 15L7.5 15.0256L11 17H3Z" fill="#4091F7"/>
+</g>
+</svg>

package/src/assets/ic_shujuhuiju_s.svg

@@ -0,0 +1,13 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujuhuiju_s">
+<g id="Frame 427319131">
+<path id="Rectangle 34624318" d="M1.99658 2.8C1.99658 2.35817 2.35475 2 2.79658 2H10.7791C11.2209 2 11.5791 2.35817 11.5791 2.8V25.2191C11.5791 27.8653 9.43397 30.0104 6.78783 30.0104C4.1417 30.0104 1.99658 27.8653 1.99658 25.2191V2.8Z" fill="#4091F7"/>
+<path id="Rectangle 34624319" d="M13.8803 3.47452C14.0838 3.12196 14.5347 3.00116 14.8872 3.20471L21.9092 7.25885C22.2617 7.46239 22.3825 7.91321 22.179 8.26576L10.938 27.7358C9.61491 30.0274 6.68463 30.8125 4.39301 29.4895C2.10139 28.1664 1.31622 25.2361 2.63929 22.9445L13.8803 3.47452Z" fill="#00F1E3"/>
+<path id="Intersect" fill-rule="evenodd" clip-rule="evenodd" d="M11.579 7.46039V25.2192C11.579 27.8653 9.43386 30.0104 6.78772 30.0104C4.16115 30.0104 2.02821 27.8969 1.99683 25.2778C2.00644 24.4838 2.2139 23.6812 2.63918 22.9446L11.579 7.46039Z" fill="#8FDEFF"/>
+<path id="Rectangle 34624321" d="M29.2698 20.4277C29.6769 20.4277 30.007 20.7578 30.007 21.1649L30.007 29.2731C30.007 29.6802 29.6769 30.0102 29.2698 30.0102L6.78783 30.0102C4.1417 30.0102 1.99658 27.8651 1.99658 25.219C1.99658 22.5728 4.1417 20.4277 6.78783 20.4277L29.2698 20.4277Z" fill="#00F1E3"/>
+<path id="Rectangle 34624320" d="M23.863 9.83875C24.2156 9.6352 24.6664 9.75599 24.8699 10.1085L28.924 17.1305C29.1276 17.4831 29.0068 17.9339 28.6542 18.1374L9.18425 29.3784C6.89264 30.7015 3.96235 29.9163 2.63929 27.6247C1.31622 25.3331 2.10139 22.4028 4.39301 21.0798L23.863 9.83875Z" fill="#4091F7"/>
+<rect id="Rectangle 34624322" x="23.5598" y="11.5823" width="6.86303" height="16.2008" rx="0.737115" transform="rotate(60 23.5598 11.5823)" fill="#00F1E3"/>
+<circle id="Ellipse 998" cx="6.97204" cy="25.0347" r="2.39562" fill="#00F1E3"/>
+</g>
+</g>
+</svg>

package/src/assets/ic_shujukaifa_m.svg

@@ -0,0 +1,15 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujukaifa_m">
+<g id="Vector">
+<path d="M18.7324 2.74747C18.7324 2.33364 18.3969 1.99817 17.9831 1.99817C17.5693 1.99817 17.2338 2.33364 17.2338 2.74747V13.4874C17.2338 13.9012 17.5693 14.2367 17.9831 14.2367C18.3969 14.2367 18.7324 13.9012 18.7324 13.4874V2.74747Z" fill="#4091F7"/>
+<path d="M6.74366 1.99817C6.32983 1.99817 5.99436 2.33364 5.99436 2.74747C5.99436 3.16129 6.32983 3.49677 6.74366 3.49677L17.9831 3.49676C18.3969 3.49676 18.7324 3.16129 18.7324 2.74747C18.7324 2.33364 18.3969 1.99817 17.9831 1.99817L6.74366 1.99817Z" fill="#4091F7"/>
+</g>
+<g id="Vector_2">
+<path d="M1.24878 17.2339C1.24878 17.6477 1.58425 17.9832 1.99808 17.9832C2.4119 17.9832 2.74738 17.6477 2.74738 17.2339L2.74737 6.49392C2.74737 6.08009 2.4119 5.74462 1.99808 5.74462C1.58425 5.74462 1.24878 6.08009 1.24878 6.49392L1.24878 17.2339Z" fill="#4091F7"/>
+<path d="M13.2375 17.9832C13.6514 17.9832 13.9868 17.6477 13.9868 17.2339C13.9868 16.82 13.6514 16.4846 13.2375 16.4846L1.99808 16.4846C1.58425 16.4846 1.24878 16.82 1.24878 17.2339C1.24878 17.6477 1.58425 17.9832 1.99808 17.9832L13.2375 17.9832Z" fill="#4091F7"/>
+</g>
+<path id="Polygon 6" d="M2.10792 2.43508C1.74756 2.62123 1.74757 3.13655 2.10792 3.3227L5.76507 5.2119C6.09755 5.38365 6.49386 5.14231 6.49386 4.76809L6.49386 0.989695C6.49386 0.615471 6.09755 0.374129 5.76507 0.545882L2.10792 2.43508Z" fill="#4091F7"/>
+<path id="Polygon 7" d="M17.6235 17.6777C17.9839 17.4915 17.9839 16.9762 17.6235 16.7901L14.1868 15.0147C13.8543 14.843 13.458 15.0843 13.458 15.4585L13.458 19.0092C13.458 19.3835 13.8543 19.6248 14.1868 19.4531L17.6235 17.6777Z" fill="#4091F7"/>
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M5.09506 8.70041C4.15721 8.81104 3.30726 8.14045 3.19663 7.20261C3.086 6.26476 3.75659 5.4148 4.69443 5.30418C5.63228 5.19355 6.48224 5.86414 6.59287 6.80198C6.66174 7.38585 6.42782 7.93566 6.01513 8.29421L7.91441 11.2365C8.01232 11.2034 8.11512 11.18 8.22185 11.1674C8.54228 11.1296 8.85108 11.1952 9.11488 11.3378L10.6219 9.42766C10.4218 9.20427 10.2861 8.91916 10.2483 8.59869C10.1507 7.77118 10.7424 7.02121 11.5699 6.9236C12.3974 6.82598 13.1474 7.41768 13.245 8.24519C13.2958 8.67571 13.16 9.08523 12.9015 9.39283L14.5275 11.5721C14.7064 11.4636 14.9109 11.3909 15.1322 11.3647C15.9598 11.2671 16.7097 11.8588 16.8073 12.6863C16.905 13.5139 16.3133 14.2638 15.4857 14.3614C14.6582 14.459 13.9083 13.8673 13.8107 13.0398C13.7739 12.7284 13.8348 12.428 13.9691 12.1692L12.2378 9.84883C12.1378 9.88314 12.0327 9.90739 11.9234 9.92028C11.7078 9.94572 11.4974 9.92434 11.3024 9.86418L9.69781 11.898C9.80172 12.0736 9.87149 12.2733 9.89694 12.489C9.99455 13.3165 9.40285 14.0665 8.57534 14.1641C7.74783 14.2617 6.99787 13.67 6.90026 12.8425C6.84915 12.4092 6.98701 11.9972 7.24874 11.689L5.29643 8.66451C5.23087 8.68027 5.16368 8.69232 5.09506 8.70041Z" fill="#4091F7"/>
+</g>
+</svg>

package/src/assets/ic_shujukaifa_s.svg

@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujukaifa_s">
+<g id="Vector">
+<path d="M2 4.40001C2 3.73727 2.53726 3.20001 3.2 3.20001C3.86274 3.20001 4.4 3.73727 4.4 4.40001V21.6C4.4 22.2628 3.86274 22.8 3.2 22.8C2.53726 22.8 2 22.2628 2 21.6V4.40001Z" fill="#4091F7"/>
+<path d="M21.2 3.20001C21.8627 3.20001 22.4 3.73727 22.4 4.40001C22.4 5.06275 21.8627 5.60001 21.2 5.60001L3.2 5.60001C2.53726 5.60001 2 5.06275 2 4.40001C2 3.73727 2.53726 3.20001 3.2 3.20001L21.2 3.20001Z" fill="#4091F7"/>
+</g>
+<g id="Vector_2">
+<path d="M30 27.6C30 28.2627 29.4627 28.8 28.8 28.8C28.1373 28.8 27.6 28.2627 27.6 27.6L27.6 10.4C27.6 9.73725 28.1373 9.19999 28.8 9.19999C29.4627 9.19999 30 9.73725 30 10.4L30 27.6Z" fill="#4091F7"/>
+<path d="M10.8 28.8C10.1373 28.8 9.6 28.2627 9.6 27.6C9.6 26.9372 10.1373 26.4 10.8 26.4L28.8 26.4C29.4627 26.4 30 26.9372 30 27.6C30 28.2627 29.4627 28.8 28.8 28.8L10.8 28.8Z" fill="#4091F7"/>
+</g>
+<path id="Polygon 6" d="M28.6241 3.89974C29.2012 4.19786 29.2012 5.02315 28.6241 5.32127L22.7672 8.34682C22.2347 8.62188 21.6 8.23537 21.6 7.63605L21.6 1.58495C21.6 0.985636 22.2347 0.599127 22.7672 0.874189L28.6241 3.89974Z" fill="#00F1E3"/>
+<path id="Polygon 7" d="M3.77607 28.3108C3.19895 28.0127 3.19895 27.1874 3.77606 26.8893L9.28004 24.046C9.81251 23.771 10.4472 24.1575 10.4472 24.7568L10.4472 30.4433C10.4472 31.0426 9.81251 31.4291 9.28004 31.154L3.77607 28.3108Z" fill="#00F1E3"/>
+<g id="Frame 427319132">
+<rect id="Rectangle 34624325" x="11.7759" y="14.4566" width="1.28866" height="6.12111" transform="rotate(36.7276 11.7759 14.4566)" fill="#00F1E3"/>
+<rect id="Rectangle 34624326" x="13.1841" y="14.8911" width="1.28866" height="6.12111" transform="rotate(-38.2724 13.1841 14.8911)" fill="#00F1E3"/>
+<rect id="Rectangle 34624327" x="23.1233" y="12.1108" width="1.28866" height="8.01193" transform="rotate(32.8426 23.1233 12.1108)" fill="#00F1E3"/>
+<circle id="Ellipse 999" cx="7.48274" cy="20.6001" r="2.41623" transform="rotate(6.7276 7.48274 20.6001)" fill="#00F1E3"/>
+<circle id="Ellipse 1000" cx="13.1876" cy="13.4879" r="2.41623" transform="rotate(6.7276 13.1876 13.4879)" fill="#00F1E3"/>
+<circle id="Ellipse 1001" cx="18.5496" cy="20.2841" r="2.41623" transform="rotate(6.7276 18.5496 20.2841)" fill="#00F1E3"/>
+<circle id="Ellipse 1002" cx="24.1609" cy="11.2142" r="2.73839" transform="rotate(6.7276 24.1609 11.2142)" fill="#00F1E3"/>
+</g>
+</g>
+</svg>

package/src/assets/ic_shujukaifang_m.svg

@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujukaifang_m">
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M10.6887 4.59835C11.6791 4.59835 12.4819 3.79551 12.4819 2.80515C12.4819 1.8148 11.6791 1.01196 10.6887 1.01196C9.69839 1.01196 8.89555 1.8148 8.89555 2.80515C8.89555 3.79551 9.69839 4.59835 10.6887 4.59835ZM6.2057 13.7884C7.44365 13.7884 8.44719 12.7849 8.44719 11.5469C8.44719 10.309 7.44365 9.30546 6.2057 9.30546C4.96776 9.30546 3.96422 10.309 3.96422 11.5469C3.96422 12.7849 4.96776 13.7884 6.2057 13.7884ZM18.9822 8.40879C18.9822 9.39914 18.1793 10.202 17.189 10.202C16.1986 10.202 15.3958 9.39914 15.3958 8.40879C15.3958 7.41844 16.1986 6.6156 17.189 6.6156C18.1793 6.6156 18.9822 7.41844 18.9822 8.40879ZM13.8269 18.7196C14.8172 18.7196 15.6201 17.9168 15.6201 16.9264C15.6201 15.9361 14.8172 15.1332 13.8269 15.1332C12.8365 15.1332 12.0337 15.9361 12.0337 16.9264C12.0337 17.9168 12.8365 18.7196 13.8269 18.7196ZM6.20583 14.685C7.93894 14.685 9.34391 13.28 9.34391 11.5469C9.34391 9.81376 7.93894 8.40879 6.20583 8.40879C4.47271 8.40879 3.06774 9.81376 3.06774 11.5469C3.06774 13.28 4.47271 14.685 6.20583 14.685ZM6.20583 16.254C8.8055 16.254 10.913 14.1466 10.913 11.5469C10.913 8.94721 8.8055 6.83975 6.20583 6.83975C3.60615 6.83975 1.4987 8.94721 1.4987 11.5469C1.4987 14.1466 3.60615 16.254 6.20583 16.254ZM9.59187 4.44138C9.25719 4.2804 8.85538 4.42121 8.6944 4.75588L8.0664 6.06149C7.90542 6.39616 8.04623 6.79798 8.38091 6.95896C8.71558 7.11994 9.1174 6.97913 9.27838 6.64445L9.90638 5.33885C10.0674 5.00417 9.92655 4.60236 9.59187 4.44138ZM14.2607 8.39292C14.6139 8.27805 14.9933 8.47123 15.1082 8.8244C15.2231 9.17757 15.0299 9.55699 14.6767 9.67187L11.7527 10.6229C11.3995 10.7378 11.0201 10.5446 10.9052 10.1915C10.7903 9.83829 10.9835 9.45887 11.3367 9.344L14.2607 8.39292ZM12.0707 15.9729C12.2958 15.6776 12.2389 15.2556 11.9435 15.0305L11.1424 14.42C10.8471 14.1948 10.4251 14.2518 10.2 14.5471C9.97488 14.8425 10.0318 15.2645 10.3272 15.4896L11.1283 16.1001C11.4236 16.3253 11.8456 16.2683 12.0707 15.9729Z" fill="#4091F7"/>
+</g>
+</svg>

package/src/assets/ic_shujukaifang_s.svg

@@ -0,0 +1,14 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujukaifang_s">
+<g id="Frame 427319117">
+<circle id="Ellipse 973" cx="9.13857" cy="18.4921" r="3.58974" fill="#00F1E3"/>
+<circle id="Ellipse 975" cx="16.3181" cy="4.49209" r="2.87179" fill="#00F1E3"/>
+<circle id="Ellipse 976" cx="26.7282" cy="13.4665" r="2.87179" fill="#00F1E3"/>
+<circle id="Ellipse 977" cx="21.3435" cy="27.1075" r="2.87179" fill="#00F1E3"/>
+<path id="Ellipse 974 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M9.13856 23.5177C11.9141 23.5177 14.1642 21.2677 14.1642 18.4921C14.1642 15.7165 11.9141 13.4664 9.13856 13.4664C6.36297 13.4664 4.11292 15.7165 4.11292 18.4921C4.11292 21.2677 6.36297 23.5177 9.13856 23.5177ZM9.13856 26.0305C13.3019 26.0305 16.677 22.6555 16.677 18.4921C16.677 14.3287 13.3019 10.9536 9.13856 10.9536C4.97518 10.9536 1.6001 14.3287 1.6001 18.4921C1.6001 22.6555 4.97518 26.0305 9.13856 26.0305Z" fill="#4091F7"/>
+<rect id="Rectangle 34624304" x="13.5906" y="6.64594" width="2.15385" height="4.47408" rx="1.07692" transform="rotate(25.6877 13.5906 6.64594)" fill="#4091F7"/>
+<rect id="Rectangle 34624305" x="23.0625" y="13.1078" width="2.15385" height="7.07815" rx="1.07692" transform="rotate(71.9823 23.0625 13.1078)" fill="#4091F7"/>
+<rect id="Rectangle 34624306" x="19.1836" y="24.724" width="2.15385" height="3.76688" rx="1.07692" transform="rotate(127.314 19.1836 24.724)" fill="#4091F7"/>
+</g>
+</g>
+</svg>

package/src/assets/ic_shujuyingyong_m.svg

@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujuyingyong_m">
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M2.73828 6.00334C1.86809 5.13315 1.88196 3.70841 2.75215 2.83821C3.62235 1.96802 5.04709 1.95415 5.91728 2.82434C6.78748 3.69454 6.77361 5.11927 5.90341 5.98947C5.03321 6.85966 3.60848 6.87354 2.73828 6.00334ZM14.2414 2.83821C13.3712 3.70841 13.3573 5.13315 14.2275 6.00334C15.0977 6.87354 16.5225 6.85966 17.3927 5.98947C18.2629 5.11927 18.2767 3.69454 17.4065 2.82434C16.5363 1.95415 15.1116 1.96802 14.2414 2.83821ZM9.99104 7.49258C10.2679 7.49258 10.5316 7.43628 10.7713 7.33449L12.5663 9.12946C12.4645 9.36918 12.4082 9.63288 12.4082 9.90974C12.4082 10.2512 12.4938 10.5726 12.6448 10.8537L10.7584 12.7401C10.4773 12.5891 10.1558 12.5035 9.81435 12.5035C9.44378 12.5035 9.09677 12.6043 8.79929 12.7801L7.12053 11.1014C7.29631 10.8039 7.39719 10.4569 7.39719 10.0863C7.39719 9.68691 7.28 9.31487 7.07813 9.00271L8.90736 7.17347C9.21954 7.37537 9.5916 7.49258 9.99104 7.49258ZM13.3226 11.5888L11.4934 13.418C11.6953 13.7302 11.8125 14.1022 11.8125 14.5016C11.8125 15.6051 10.9179 16.4997 9.81435 16.4997C8.71081 16.4997 7.81622 15.6051 7.81622 14.5016C7.81622 14.1311 7.91708 13.7841 8.09285 13.4866L6.41407 11.8078C6.1166 11.9836 5.76961 12.0844 5.39906 12.0844C4.29553 12.0844 3.40093 11.1899 3.40093 10.0863C3.40093 8.98278 4.29553 8.08819 5.39906 8.08819C5.74052 8.08819 6.06198 8.17384 6.34312 8.32483L8.22952 6.43843C8.07855 6.15731 7.99291 5.83588 7.99291 5.49445C7.99291 4.39092 8.88751 3.49633 9.99104 3.49633C11.0946 3.49633 11.9892 4.39092 11.9892 5.49445C11.9892 5.95622 11.8325 6.38141 11.5695 6.71977L13.181 8.33129C13.5194 8.06825 13.9446 7.91161 14.4063 7.91161C15.5099 7.91161 16.4045 8.8062 16.4045 9.90974C16.4045 11.0133 15.5099 11.9079 14.4063 11.9079C14.0069 11.9079 13.6348 11.7907 13.3226 11.5888ZM11.313 9.99023C11.313 10.8179 10.642 11.4888 9.81439 11.4888C8.98673 11.4888 8.31579 10.8179 8.31579 9.99023C8.31579 9.16258 8.98673 8.49163 9.81439 8.49163C10.642 8.49163 11.313 9.16258 11.313 9.99023ZM14.2414 13.8279C13.3712 14.6981 13.3573 16.1229 14.2275 16.9931C15.0977 17.8633 16.5225 17.8494 17.3927 16.9792C18.2629 16.109 18.2767 14.6843 17.4065 13.8141C16.5363 12.9439 15.1116 12.9577 14.2414 13.8279ZM2.73828 16.9931C1.86809 16.1229 1.88196 14.6981 2.75215 13.8279C3.62235 12.9577 5.04709 12.9439 5.91728 13.8141C6.78748 14.6843 6.77361 16.109 5.90341 16.9792C5.03321 17.8494 3.60848 17.8633 2.73828 16.9931Z" fill="#4091F7"/>
+</g>
+</svg>

package/src/assets/ic_shujuyingyong_s.svg

@@ -0,0 +1,19 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujuyingyong_s">
+<g id="Frame 427319118">
+<rect id="Rectangle 34624309" x="18.0688" y="9.55981" width="6.8" height="1.6" transform="rotate(45 18.0688 9.55981)" fill="#00F1E3"/>
+<rect id="Rectangle 34624310" x="10.9976" y="16.6309" width="6.8" height="1.6" transform="rotate(45 10.9976 16.6309)" fill="#00F1E3"/>
+<rect id="Rectangle 34624311" x="22.877" y="17.7623" width="6.8" height="1.6" transform="rotate(135 22.877 17.7623)" fill="#00F1E3"/>
+<rect id="Rectangle 34624312" x="15.8059" y="10.691" width="6.8" height="1.6" transform="rotate(135 15.8059 10.691)" fill="#00F1E3"/>
+<circle id="Ellipse 978" cx="23.354" cy="16.1539" r="3.2" transform="rotate(90 23.354 16.1539)" fill="#00F1E3"/>
+<circle id="Ellipse 979" cx="16.0002" cy="8.80004" r="3.2" transform="rotate(90 16.0002 8.80004)" fill="#00F1E3"/>
+<circle id="Ellipse 980" cx="8.92891" cy="15.8711" r="3.2" transform="rotate(90 8.92891 15.8711)" fill="#00F1E3"/>
+<circle id="Ellipse 981" cx="16.2829" cy="23.225" r="3.2" transform="rotate(90 16.2829 23.225)" fill="#00F1E3"/>
+<circle id="Ellipse 982" cx="16.2831" cy="16" r="2.4" transform="rotate(90 16.2831 16)" fill="#4091F7"/>
+</g>
+<rect id="Rectangle 34624308" x="11.738" y="7.091" width="7.13716" height="7.2" rx="3.56858" transform="rotate(135 11.738 7.091)" fill="#4091F7"/>
+<rect id="Rectangle 34624310_2" x="30.1379" y="7.091" width="7.13716" height="7.2" rx="3.56858" transform="rotate(135 30.1379 7.091)" fill="#4091F7"/>
+<rect id="Rectangle 34624309_2" x="11.738" y="24.691" width="7.13716" height="7.2" rx="3.56858" transform="rotate(135 11.738 24.691)" fill="#4091F7"/>
+<rect id="Rectangle 34624311_2" x="30.1379" y="24.691" width="7.13716" height="7.2" rx="3.56858" transform="rotate(135 30.1379 24.691)" fill="#4091F7"/>
+</g>
+</svg>

package/src/assets/ic_shujuzhili_m.svg

@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujuzhili_m">
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M5.81956 4.59565C4.82637 4.59565 4.02124 3.79052 4.02124 2.79734C4.02124 1.80416 4.82637 0.999023 5.81956 0.999023C6.81274 0.999023 7.61787 1.80416 7.61787 2.79734C7.61787 2.98681 7.58857 3.16943 7.53425 3.34093L11.0914 6.26285C11.3816 6.06199 11.7338 5.94432 12.1135 5.94432C12.6031 5.94432 13.0471 6.14 13.3713 6.45742L16.402 4.84739C16.3905 4.76515 16.3845 4.68112 16.3845 4.5957C16.3845 3.60252 17.1897 2.79739 18.1828 2.79739C19.176 2.79739 19.9812 3.60252 19.9812 4.5957C19.9812 5.58888 19.176 6.39402 18.1828 6.39402C17.7666 6.39402 17.3834 6.2526 17.0786 6.01518L13.9113 7.69783C13.9116 7.71272 13.9118 7.72766 13.9118 7.74264C13.9118 8.73582 13.1067 9.54095 12.1135 9.54095C11.1203 9.54095 10.3152 8.73582 10.3152 7.74264C10.3152 7.6247 10.3265 7.50942 10.3482 7.39783L6.67427 4.37994C6.42005 4.51753 6.12892 4.59565 5.81956 4.59565ZM19.4816 8.24223C19.4816 7.55252 18.9225 6.9934 18.2327 6.9934C17.543 6.9934 16.9839 7.55252 16.9839 8.24223V12.738C16.9839 13.4277 17.543 13.9868 18.2327 13.9868C18.9225 13.9868 19.4816 13.4277 19.4816 12.738V8.24223ZM11.9885 10.4901C12.6783 10.4901 13.2374 11.0493 13.2374 11.739V15.7352C13.2374 16.4249 12.6783 16.9841 11.9885 16.9841C11.2988 16.9841 10.7397 16.4249 10.7397 15.7352V11.739C10.7397 11.0493 11.2988 10.4901 11.9885 10.4901ZM6.99318 6.74363C6.99318 6.05392 6.43406 5.4948 5.74435 5.4948C5.05464 5.4948 4.49552 6.05392 4.49552 6.74363V9.24129C4.49552 9.93099 5.05464 10.4901 5.74435 10.4901C6.43406 10.4901 6.99318 9.931 6.99318 9.24129V6.74363ZM8.89969 14.3542C9.03672 14.6848 9.38907 14.8727 9.78129 14.8635C9.84514 15.2476 9.84514 15.6396 9.78129 16.0238V16.0241C9.38943 16.0145 9.03672 16.2021 8.89969 16.5331C8.76266 16.8641 8.87904 17.2463 9.16307 17.5168C8.93642 17.8338 8.65899 18.1111 8.34197 18.3376C8.07183 18.0536 7.68957 17.9372 7.35857 18.0742C7.02792 18.2112 6.84 18.5636 6.84961 18.9558C6.46525 19.0197 6.07297 19.0197 5.68861 18.9558C5.69822 18.5639 5.51065 18.2112 5.17965 18.0742C4.84865 17.9372 4.46639 18.0536 4.1959 18.3376C3.87897 18.1109 3.60166 17.8335 3.37515 17.5165C3.65917 17.2463 3.77556 16.8641 3.63853 16.5331C3.5015 16.2024 3.14915 16.0145 2.75693 16.0241C2.693 15.6398 2.693 15.2475 2.75693 14.8631C3.14879 14.8727 3.5015 14.6852 3.63853 14.3542C3.77556 14.0232 3.65917 13.6409 3.37515 13.3704C3.6018 13.0535 3.87923 12.7762 4.19625 12.5497C4.46639 12.8337 4.84865 12.9501 5.17965 12.813C5.5103 12.676 5.69822 12.3237 5.68861 11.9314C6.07297 11.8675 6.46525 11.8675 6.84961 11.9314C6.84 12.3233 7.02757 12.676 7.35857 12.813C7.68957 12.9501 8.07183 12.8337 8.34232 12.5497C8.65924 12.7763 8.93656 13.0537 9.16307 13.3708C8.87904 13.6409 8.76266 14.0232 8.89969 14.3542ZM5.5141 16.1986C5.71434 16.3989 5.98592 16.5114 6.26911 16.5114C6.55229 16.5114 6.82388 16.3989 7.02412 16.1986C7.22436 15.9984 7.33686 15.7268 7.33686 15.4436C7.33686 15.1604 7.22436 14.8889 7.02412 14.6886C6.82388 14.4884 6.55229 14.3759 6.26911 14.3759C5.98592 14.3759 5.71434 14.4884 5.5141 14.6886C5.31385 14.8889 5.20136 15.1604 5.20136 15.4436C5.20136 15.7268 5.31385 15.9984 5.5141 16.1986Z" fill="#4091F7"/>
+</g>
+</svg>

package/src/assets/ic_shujuzhili_s.svg

@@ -0,0 +1,24 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_shujuzhili_s">
+<g id="Frame 427319122">
+<rect id="Rectangle 34624316" x="8.17334" y="7.35999" width="7.56" height="2.16" transform="rotate(27.9793 8.17334 7.35999)" fill="#00F1E3"/>
+<rect id="Rectangle 34624317" x="25.2205" y="6.43152" width="9.9513" height="2.16" transform="rotate(140.599 25.2205 6.43152)" fill="#00F1E3"/>
+<circle id="Ellipse 992" cx="6.07995" cy="7.35998" r="2.88" fill="#00F1E3"/>
+<circle id="Ellipse 993" cx="15.7999" cy="12.4" r="2.88" fill="#00F1E3"/>
+<circle id="Ellipse 994" cx="25.88" cy="4.47998" r="2.88" fill="#00F1E3"/>
+<rect id="Rectangle 34624313" x="4" y="11.2" width="4" height="11.2" rx="2" fill="#4091F7"/>
+<rect id="Rectangle 34624314" x="14" y="16.8" width="4" height="10.4" rx="2" fill="#4091F7"/>
+<rect id="Rectangle 34624315" x="24" y="8.79999" width="4" height="8" rx="2" fill="#4091F7"/>
+<g id="remix-icons/fill/system/settings-5-fill" clip-path="url(#clip0_1958_113208)">
+<g id="Group">
+<path id="Vector" d="M19.5354 26.2891C19.4332 25.6739 19.4332 25.0461 19.5354 24.4309C20.1636 24.4457 20.7279 24.1447 20.9473 23.6152C21.1668 23.0851 20.9804 22.4729 20.5255 22.0403C20.8883 21.5326 21.3324 21.0883 21.8399 20.7253C22.2731 21.1802 22.8853 21.3666 23.4154 21.1471C23.9455 20.9277 24.2459 20.3628 24.2305 19.7352C24.8461 19.6329 25.4743 19.6329 26.0899 19.7352C26.0745 20.3634 26.3754 20.9277 26.905 21.1471C27.4351 21.3666 28.0472 21.1802 28.4799 20.7253C28.9876 21.0881 29.4319 21.5322 29.7949 22.0397C29.34 22.4729 29.1536 23.0851 29.3731 23.6152C29.5925 24.1453 30.1574 24.4457 30.7849 24.4303C30.8873 25.0459 30.8873 25.6741 30.7849 26.2897C30.1568 26.2743 29.5925 26.5752 29.3731 27.1048C29.1536 27.6349 29.34 28.247 29.7949 28.6797C29.4321 29.1874 28.988 29.6317 28.4804 29.9947C28.0472 29.5398 27.4351 29.3534 26.905 29.5729C26.3749 29.7923 26.0745 30.3572 26.0899 30.9847C25.4743 31.0871 24.8461 31.0871 24.2305 30.9847C24.2459 30.3566 23.9449 29.7923 23.4154 29.5729C22.8853 29.3534 22.2731 29.5398 21.8405 29.9947C21.3328 29.6319 20.8885 29.1878 20.5255 28.6802C20.9804 28.247 21.1668 27.6349 20.9473 27.1048C20.7279 26.5747 20.163 26.2743 19.5354 26.2897V26.2891ZM25.1602 27.07C25.6137 27.07 26.0486 26.8898 26.3693 26.5691C26.69 26.2485 26.8702 25.8135 26.8702 25.36C26.8702 24.9065 26.69 24.4715 26.3693 24.1508C26.0486 23.8301 25.6137 23.65 25.1602 23.65C24.7067 23.65 24.2717 23.8301 23.951 24.1508C23.6303 24.4715 23.4502 24.9065 23.4502 25.36C23.4502 25.8135 23.6303 26.2485 23.951 26.5691C24.2717 26.8898 24.7067 27.07 25.1602 27.07Z" fill="#00F1E3"/>
+</g>
+</g>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1958_113208">
+<rect width="13.68" height="13.68" fill="white" transform="translate(18.3201 18.52)"/>
+</clipPath>
+</defs>
+</svg>

package/src/pages/Footer/index.jsx

@@ -0,0 +1,8 @@
+import { DefaultFooter } from '@ant-design/pro-layout';
+const Footer = ()=>{
+    const copyright = '中移系统集成有限公司';
+    return (
+    <DefaultFooter copyright={copyright} links={[]} />);
+}
+
+export default Footer;

package/src/pages/ModuleMenu/constData.jsx

@@ -5,14 +5,14 @@ export const menuList = [{
 },
 {
     name: '数据汇聚',
-    url: require('../../assets/module.svg'),
+    url: require('../../assets/ic_shujuhuiju_m.svg'),
     children: [{
         childName: '数据集成平台'
     }]
 },
 {
     name: '数据治理',
-    url: require('../../assets/module.svg'),
+    url: require('../../assets/ic_shujuzhili_m.svg'),
     children: [{
         childName: '数据治理平台'
     },
@@ -28,7 +28,7 @@ export const menuList = [{
 },
 {
     name: '数据开发',
-    url: require('../../assets/module.svg'),
+    url: require('../../assets/ic_shujukaifa_m.svg'),
     children: [{
         childName: '离线开发平台'
     },
@@ -38,7 +38,7 @@ export const menuList = [{
 },
 {
     name: '数据开放',
-    url: require('../../assets/module.svg'),
+    url: require('../../assets/ic_shujukaifang_m.svg'),
     children: [{
         childName: '数据服务'
     },
@@ -48,13 +48,40 @@ export const menuList = [{
 },
 {
     name: '数据应用',
-    url: require('../../assets/module.svg'),
+    url: require('../../assets/ic_shujuyingyong_m.svg'),
     children: [{
         childName: '标签管理系统'
     },
     {
         childName: '数据可视化'
     }]
+},
+{
+    name: '公共模块',
+    url: require('../../assets/ic_gonggongmokuai_m.svg'),
+    children: [{
+        childName: '运维中心'
+    },
+    {
+        childName: '系统管理'
+    },
+    {
+        childName: '工单管理'
+    }]
 }];
 export const menuIconSrc = require('../../assets/menuIcon.svg');
-export const childIconSrc = require('../../assets/childIcon.svg');
+export const childIconSrc = require('../../assets/childIcon.svg');
+
+export const sysNameMap = [
+    {
+        sysName: 'datacollection',
+        title: '数据集成',
+        logoSrc: require('../../assets/ic_shujuhuiju_s.svg'),
+    },
+    {
+        sysName: 'dataManager',
+        title: '数据治理',
+        logoSrc: require('../../assets/ic_shujuzhili_s.svg'),
+    },
+
+];

package/src/pages/ModuleMenu/index.jsx

@@ -1,39 +1,35 @@
-import React, { Component } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { Popconfirm, message } from 'antd';
-import {menuList, menuIconSrc, childIconSrc} from './constData'
+import {menuList,menuIconSrc, childIconSrc, sysNameMap} from './constData'
 import './index.less'
-class ModuleMenu extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            showMenu: false,
-            sessionMenu: []
-        }
-    }
 
-    componentDidMount () {
+const ModuleMenu = ({sysName})=>{
+    const [sessionMenu, setsessionMenu] = useState([]);
+
+
+    useEffect(() => {
         const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'))
-        console.log('menuObj', menuObj)
         if (menuObj) {
-            this.setStateAsync({
-                sessionMenu: menuObj.content || []
-            })
+            setsessionMenu(menuObj.content || [])
         }
-    };
-
-    // 封装this.setState变成同步
-    setStateAsync(state) {
-        return new Promise((resolve) => {
-            this.setState(state, resolve);
-        });
-    };
+    }, []);
+    // 获取系统logo及title
+    const getLogoAndTitle = () =>{
+        let sysInfo = sysNameMap.find(item=>item.sysName === sysName);
+        let logoAndTitle = {logoSrc:"",title:""};
+        if(sysInfo){
+            logoAndTitle.logoSrc = sysInfo.logoSrc;
+            logoAndTitle.title = sysInfo.title;
+        };
+        return logoAndTitle;
+    }
 
     /**
      * 判断第三方服务是否有对应服务的菜单权限
      * @param {*} authMenus
      * @param {*} rootMenuPath
      */
-     judgeThirdPartyServiceIsHaveMenus(authMenus, rootMenuPath) {
+    const judgeThirdPartyServiceIsHaveMenus=(authMenus, rootMenuPath) => {
         let dsMenus = [];
         if (
           typeof authMenus !== "undefined" &&
@@ -59,11 +55,10 @@ class ModuleMenu extends Component {
           return false;
         }
         return true;
-    }
-
+    };
     // 跳转各个模块
-    toModulePage (nameStr) {
-        if (!this.state.sessionMenu || this.state.sessionMenu.length === 0) {
+    const toModulePage= (nameStr)=> {
+        if (!sessionMenu || sessionMenu.length === 0) {
             message.destroy()
             message.warning("没有获取到菜单列表，请联系管理员添加权限");
             return;
@@ -116,8 +111,8 @@ class ModuleMenu extends Component {
         }
         // 判断第三方服务是否有对应服务的菜单权限
         if (
-        !this.judgeThirdPartyServiceIsHaveMenus(
-            this.state.sessionMenu,
+        !judgeThirdPartyServiceIsHaveMenus(
+            sessionMenu,
             thirdPartyServiceRootMenuPath
         )
         ) {
@@ -126,59 +121,58 @@ class ModuleMenu extends Component {
             return
         }
         window.location.href = thirdPartyServiceJumpPath
-    }
-
+    };
     // 跳转首页
-    toHomePage (index) {
+    const toHomePage = (index) => {
         if (index === 0) {
             window.location.href = '/index'
         }
-    }
+    };
 
-    render() {
-        const menu = menuList.map((item, index) => {
-            return (
-                <div key={item.name} className="cardLine" style={{height: index === 2 ? '90px' : ''}}>
-                    <div className='leftMenu'>
-                        <img src={item.url} className="middle"/>
-                        <span className="middle textPad" onClick={() => {this.toHomePage(index)}}>{item.name}</span>
-                    </div>
-                    <div className='rightMenu' style={{height: index === 2 ? '90px' : '', borderBottom: index === 5 ? '0px' : '1px solid #E9E9E9'}}>
-                        {
-                            item.children.map((child, idx) => {
-                                return (
-                                    <span key={child.childName}>
-                                        <img src={childIconSrc} className="middle iconPad"/>
-                                        <span className='childMenu textPad middle' onClick={() => {this.toModulePage(child.childName)}}>{child.childName}</span>
-                                    </span>
-                                )
-                            })
-                        }
-                    </div>
-                </div>
-            )
-        });
+    const menu = menuList.map((item, index) => {
         return (
-            <div className='menuPopupAndTitle'>
-                <Popconfirm
-                    placement="rightTop"
-                    title={menu}
-                    okText=""
-                    icon={false}
-                    cancelText=""
-                    className='popupCss'
-                    showCancel = {false}
-                >
-                    <div className='menuIcon'>
-                        <img src={menuIconSrc}/>
-                    </div>
-                </Popconfirm>
-                <div className="menu_title_content">
-                <span className="menu_title">{this.props.title || ''}</span>
+            <div key={item.name} className="cardLine" style={{height: index === 2 ? '90px' : ''}}>
+                <div className='leftMenu'>
+                    <img src={item.url} className="middle"/>
+                    <span className="middle textPad" onClick={() => {toHomePage(index)}}>{item.name}</span>
+                </div>
+                <div className='rightMenu' style={{height: index === 2 ? '90px' : '', borderBottom: index === 6 ? '0px' : '1px solid #E9E9E9'}}>
+                    {
+                        item.children.map((child, idx) => {
+                            return (
+                                <span key={child.childName}>
+                                    <img src={childIconSrc} className="middle iconPad"/>
+                                    <span className='childMenu textPad middle' onClick={() => {toModulePage(child.childName)}}>{child.childName}</span>
+                                </span>
+                            )
+                        })
+                    }
                 </div>
             </div>
-        );
-    }
-}
+        )
+    });
+
+    return (
+        <div className='menuPopupAndTitle'>
+            <Popconfirm
+                placement="bottomLeft"
+                title={menu}
+                okText=""
+                icon={false}
+                cancelText=""
+                // className='popupCss'
+                showCancel = {false}
+            >
+                <div className='menuIcon'>
+                    <img className="menuIcon_img" src={menuIconSrc}/>
+                </div>
+            </Popconfirm>
+            <div className="menu_title_content">
+            <img className="menu_title_content_img" src={getLogoAndTitle().logoSrc} alt="logo"/>
+            <span className="menu_title">{getLogoAndTitle().title}</span>
+            </div>
+        </div>
+    );
 
-export default ModuleMenu
+}
+export default ModuleMenu;

package/src/pages/ModuleMenu/index.less

@@ -29,6 +29,7 @@
     font-size: 16px;
     cursor: pointer;
     text-align: left;
+    font-weight: 400;
 }
 .rightMenu{
     width: 460px;
@@ -38,6 +39,7 @@
     padding: 5px 10px 0px 10px;
     font-size: 14px;
     color: rgba(0,0,0,0.65);
+    font-weight: 400;
 }
 .childMenu:hover{
     cursor: pointer;
@@ -60,20 +62,31 @@
 }
 .menuIcon{
     text-align: center;
+    line-height: 49px;
     display: inline-block;
     cursor: pointer;
-    padding: 10px;
+    width: 60px;
+    height: 49px;
+    // padding: 10px;
     background-color: #4091F7;
 }
+.menuIcon_img{
+    height: 25px;
+    width: 25px;
+}
 .menu_title_content{
     height: 32px;
     margin: 0 0 0 12px;
     font-weight: 600;
     font-size: 18px;
-    line-height: 32px;
+    line-height: 49px;
     vertical-align: middle;
     animation: pro-layout-title-hide .3s;
 }
+.menu_title_content_img{
+    height: 32px;
+    width: 32px;
+}
 .menu_title{
     color: #1890ff;
     height: 32px;
@@ -88,8 +101,9 @@
     border-radius: 0px;
 }
 .ant-popover {
-    padding-left: 53px !important;
+    top:44px;
     left: 0px !important;
+    padding-left: 0px !important;
 }
 .ant-popover-buttons{
     bottom: 0px !important;

package/src/pages/ModuleUser/index.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Popconfirm, message, Dropdown } from 'antd';
 import { userMenuIcon } from './constData'
-import { HomeOutlined, UserOutlined } from '@ant-design/icons';
+import { HomeOutlined, UserOutlined, CaretDownOutlined} from '@ant-design/icons';
 import { Spin, Menu, Avatar } from 'antd';
 import HeaderDropdown from './HeaderDropdown'
 import './index.less'
@@ -13,8 +13,7 @@ const ModuleUser = () => {
     const isHaveSystemManagementPermission = sessionStorage.getItem('bigdata-isHaveSystemManagementPermission');
 
     const getUserName = () => {
-      const userInfo = JSON.parse(sessionStorage.getItem('bigdata-userInfo')||"");
-      console.log('userInfo', userInfo)
+      const userInfo = JSON.parse(sessionStorage.getItem('bigdata-userInfo')||"{}");
       if (userInfo && userInfo.content && Object.keys(userInfo.content).length > 0 && userInfo.content.username) {
           return userInfo.content.username;
       }
@@ -49,7 +48,7 @@ const ModuleUser = () => {
                         <Avatar size="small" icon={<UserOutlined />} />
                         <span
                             style={{
-                                marginLeft: '8px',
+                                marginLeft: '10px',
                                 verticalAlign: '-2px',
                                 fontSize: '16px',
                                 fontWeight: '500',
@@ -57,6 +56,7 @@ const ModuleUser = () => {
                         >
                             {getUserName()}
                         </span>
+                        <CaretDownOutlined style={{marginLeft: '10px', fontSize:'8px'}}/>
                     </span>
                 </HeaderDropdown>
             ) : (

package/src/pages/PageHeader/index.jsx

@@ -3,10 +3,10 @@ import ModuleMenu from '../ModuleMenu';
 import ModuleUser from '../ModuleUser'
 import './index.less'
 
-const PageHeader = (title)=>{
-
+const PageHeader = ({sysName})=>{
+// const sysNames = 'datacollection';
 return (<div className="pageheader">
-    <ModuleMenu title={"One City | 数据集成"}/>
+    <ModuleMenu sysName={sysName||''}/>
     <ModuleUser/>
 </div>)
 }

package/src/pages/PageHeader/index.less

@@ -1,10 +1,11 @@
 .pageheader{
     display: flex;
     justify-content: space-between;
-    padding: 0 16px;
     position: absolute;
     top: 0;
     left: 0;
     width: 100%;
+    height: 49px;
     background-color: #fff;
+    padding-right: 16px;
 }

package/src/pages/index.jsx

@@ -1,2 +1,4 @@
 import PageHeader from './PageHeader';
-export default PageHeader
+import Footer from './Footer'
+export {PageHeader,Footer}
+// export default Footer