Răsfoiți Sursa

feat: 优化物联概览页面显示

yanglzh 1 an în urmă
părinte
comite
1e6781b5ea

+ 1 - 1
package.json

@@ -34,7 +34,7 @@
     "cropperjs": "^1.5.12",
     "dayjs": "^1.11.8",
     "downloadjs": "^1.4.7",
-    "echarts": "^5.3.3",
+    "echarts": "^5.5.0",
     "echarts-gl": "^2.0.9",
     "echarts-wordcloud": "^2.0.0",
     "element-plus": "2.2.28",

+ 21 - 0
public/imgs/dashboard-icon1.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="75px" height="75px" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#64B9FF" offset="0%"></stop>
+            <stop stop-color="#3484FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="用户管理-企业审核备份-7" transform="translate(-300, -166)">
+            <g id="编组-5" transform="translate(300, 166)">
+                <circle id="椭圆形" fill="#3484FF" opacity="0.128383092" cx="37.5" cy="37.5" r="37.5"></circle>
+                <circle id="椭圆形" fill="url(#linearGradient-1)" cx="37.5" cy="37.5" r="28.5"></circle>
+                <g id="chanpinku" transform="translate(22, 21)" fill="#FFFFFF" fill-rule="nonzero">
+                    <path d="M28.6569108,5.6588476 L17.6609118,0.450669479 C16.3182805,-0.15022316 14.7831697,-0.15022316 13.4405384,0.450669479 L2.44453944,5.75627952 C0.885702702,6.46044644 0,7.86213725 0,9.46533492 L0,21.3852426 C0,22.9862259 0.998629805,24.3901311 2.44453944,25.1895156 L13.4405384,30.4995543 C14.1048155,30.8007075 14.8842338,31 15.5507251,31 C16.3279292,31 16.9944205,30.8007075 17.6609118,30.4995543 L28.5461979,25.2913762 C30.1006062,24.4897773 31.1014502,23.0858722 30.9907374,21.4826745 L30.9907374,9.46754928 C31.1014502,7.86435158 30.2135333,6.4626608 28.6569108,5.6588476 Z M14.5520953,2.35280595 C14.8509462,2.16249495 15.1964899,2.0582906 15.5507251,2.05165281 C15.8828636,2.05165281 16.2172164,2.15351343 16.5493549,2.25094534 L27.5475682,7.46133783 C27.658281,7.56098411 27.8797067,7.66063036 27.9904195,7.76249097 L15.5507251,13.7722679 L3.11103072,7.85992288 C3.22174356,7.76249097 3.44316924,7.66063036 3.55388208,7.56098408 L14.5520953,2.35280595 Z M3.55388208,23.2873791 C2.77889222,22.8865797 2.22089952,22.1846271 2.33161236,21.3830282 L2.33161236,9.8683487 L6.88633848,12.0716383 L6.88633848,16.8790171 C6.88633848,17.2776021 7.10776417,17.6806159 7.55282976,17.8799084 L8.33003388,18.2807079 C8.44074673,18.2807079 8.44074673,18.3803541 8.55145954,18.3803541 C8.88581229,18.3803541 9.10723798,18.1810616 9.10723798,17.8799084 L9.10723798,13.1699616 L14.3284554,15.6766188 L14.3284554,28.5974178 L3.55388208,23.2895934 L3.55388208,23.2873791 Z M27.5475682,23.2873791 L16.662282,28.4955572 L16.662282,15.5747582 L28.7698379,9.86613434 L28.7698379,21.3852426 C28.7698379,22.1846271 28.3247723,22.8865796 27.5475682,23.2873791 Z" id="形状"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

+ 22 - 0
public/imgs/dashboard-icon2.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="75px" height="75px" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#6498FF" offset="0%"></stop>
+            <stop stop-color="#5834FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="用户管理-企业审核备份-7" transform="translate(-717, -166)">
+            <g id="编组-5" transform="translate(717, 166)">
+                <circle id="椭圆形" fill="#4834FF" opacity="0.128383092" cx="37.5" cy="37.5" r="37.5"></circle>
+                <circle id="椭圆形" fill="url(#linearGradient-1)" cx="37.5" cy="37.5" r="28.5"></circle>
+                <g id="shebei" transform="translate(23.3333, 24)" fill="#FFFFFF" fill-rule="nonzero">
+                    <path d="M26.7327647,0 L2.26723525,0 C1.01682066,0 0,1.01177364 0,2.25598177 L0,24.7440182 C0,25.9882264 1.01682066,27 2.26723525,27 L26.7327647,27 C27.9831793,27 29,25.9882264 29,24.7440182 L29,2.25598177 C29,1.01177364 27.9831793,0 26.7327647,0 L26.7327647,0 Z M26.5953566,2.39270794 L26.5953566,8.42916825 L2.40464345,8.42916825 L2.40464345,2.39270794 L26.5953566,2.39270794 Z M26.5953566,10.8218762 L26.5953566,16.4994303 L2.40464345,16.4994303 L2.40464345,10.8218762 L26.5953566,10.8218762 Z M2.40464345,24.6072921 L2.40464345,18.8921382 L26.5953566,18.8921382 L26.5953566,24.6072921 L2.40464345,24.6072921 Z" id="形状"></path>
+                    <path d="M21.2389381,7.32343721 L22.7610619,7.32343721 C23.4442478,7.32343721 24,6.80232344 24,6.16171861 C24,5.52111377 23.4442478,5 22.7610619,5 L21.2389381,5 C20.5557522,5 20,5.52111377 20,6.16171861 C20,6.80232344 20.5557522,7.32343721 21.2389381,7.32343721 Z M21.2389381,15.160059 L22.7610619,15.160059 C23.4442478,15.160059 24,14.6389452 24,13.9983404 C24,13.3577356 23.4442478,12.8366218 22.7610619,12.8366218 L21.2389381,12.8366218 C20.5557522,12.8366218 20,13.3577356 20,13.9983404 C20,14.6422644 20.5557522,15.160059 21.2389381,15.160059 Z M22.7610619,20.6765628 L21.2389381,20.6765628 C20.5557522,20.6765628 20,21.1976766 20,21.8382814 C20,22.4788862 20.5557522,23 21.2389381,23 L22.7610619,23 C23.4442478,23 24,22.4788862 24,21.8382814 C24,21.1943574 23.4442478,20.6765628 22.7610619,20.6765628 Z" id="形状"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

Fișier diff suprimat deoarece este prea mare
+ 14 - 0
public/imgs/dashboard-icon3.svg


+ 25 - 0
public/imgs/dashboard-icon4.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="75px" height="75px" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 14</title>
+    <defs>
+        <linearGradient x1="32.0126532%" y1="0%" x2="79.5974928%" y2="87.6169329%" id="linearGradient-1">
+            <stop stop-color="#8DAAFF" offset="0%"></stop>
+            <stop stop-color="#C48CFF" offset="99.9147215%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="用户管理-企业审核备份-7" transform="translate(-1545, -159)">
+            <g id="编组-14" transform="translate(1552, 166)">
+                <circle id="椭圆形备份-3" stroke-opacity="0.130155763" stroke="#AD96F6" stroke-width="7" fill="url(#linearGradient-1)" cx="30.5" cy="30.5" r="34"></circle>
+                <g id="yujing-2" transform="translate(13, 13)" fill="#FFFFFF" fill-rule="nonzero">
+                    <path d="M26.7339293,25.996396 C26.0349943,25.996396 25.4678585,25.4846228 25.4678585,24.8539164 L25.4678585,20.475012 C25.4678585,16.5105718 21.8933054,13.2849592 17.5,13.2849592 C13.1066946,13.2849592 9.5321415,16.5105718 9.5321415,20.475012 L9.5321415,24.8575204 C9.5321415,25.4882268 8.96500571,26 8.26607075,26 C7.56713579,26 7,25.4882268 7,24.8575204 L7,20.475012 C7,15.2491591 11.7088246,11 17.5,11 C23.2911754,11 28,15.2491591 28,20.475012 L28,24.8575204 C28,25.4846228 27.4328642,25.996396 26.7339293,25.996396 L26.7339293,25.996396 Z" id="路径"></path>
+                    <path d="M30.4949137,32 L5.50508635,32 C3.57085403,32 2,30.4305588 2,28.5027116 C2,26.5748644 3.57463922,25.0054232 5.50508635,25.0054232 L30.4911285,25.0054232 C32.4253608,25.0054232 34,26.5748644 34,28.5027116 C34,30.4305588 32.4253608,32 30.4949137,32 Z M5.50508635,27.397312 C4.89567069,27.397312 4.39602555,27.891535 4.39602555,28.5027116 C4.39602555,29.1138882 4.8918855,29.6081113 5.50508635,29.6081113 L30.4911285,29.6081113 C31.1043293,29.6081113 31.6001893,29.1138882 31.6001893,28.5027116 C31.6001893,27.891535 31.1043293,27.397312 30.4911285,27.397312 L5.50508635,27.397312 Z M18.0492075,7.20207498 C17.3867991,7.20207498 16.8493021,6.66635228 16.8493021,6.00613063 L16.8493021,1.19594435 C16.8493021,0.535722707 17.3867991,0 18.0492075,0 C18.7116158,0 19.2491128,0.535722707 19.2491128,1.19594435 L19.2491128,6.00613063 C19.2491128,6.66635228 18.7116158,7.20207498 18.0492075,7.20207498 Z" id="形状"></path>
+                    <path d="M10.7692679,9.80114991 C10.3413564,9.80114991 9.92900538,9.57817439 9.69948922,9.18307743 L7.22149276,4.86048198 C6.88305368,4.26588062 7.081449,3.51089336 7.67274486,3.16665046 C8.26015062,2.82240757 9.01483086,3.02973567 9.35716004,3.62042519 L11.8351565,7.94302064 C12.1735956,8.537622 11.9752003,9.29260926 11.3839044,9.63685216 C11.1893992,9.74638399 10.9793335,9.80114991 10.7692679,9.80114991 Z M5.52540727,15 C5.31534164,15 5.105276,14.9452341 4.91077079,14.8357023 L0.616095602,12.3399413 C0.0247997432,11.9956984 -0.173595578,11.2407111 0.164843499,10.6461097 C0.507172681,10.0554202 1.25796282,9.84809212 1.84925868,10.192335 L6.14393386,12.688096 C6.73522972,13.0323389 6.93362504,13.7873262 6.59518596,14.3819275 C6.36566981,14.7770245 5.95331875,15 5.52540727,15 Z" id="形状"></path>
+                    <path d="M5.41965354,14.8662209 C5.21360847,14.8662209 5.00756339,14.8236548 4.81678092,14.7385226 L0.604303818,12.7987254 C0.0243250876,12.5311672 -0.170273039,11.9443633 0.161688471,11.4822173 C0.497465631,11.0231117 1.23388599,10.8619686 1.81386472,11.1295269 L6.02634182,13.0693241 C6.60632055,13.3368823 6.80091868,13.9236862 6.46895717,14.3858322 C6.24383384,14.6929161 5.83937499,14.8662209 5.41965354,14.8662209 Z M29.5803465,15 C29.160625,15 28.7561662,14.8266952 28.5310428,14.5196113 C28.1990813,14.0574653 28.3936794,13.4706614 28.9736582,13.2031032 L33.1861353,11.263306 C33.7622984,10.9957477 34.5025344,11.1568908 34.8383115,11.6159964 C35.170273,12.0781424 34.9756749,12.6649463 34.3956962,12.9325045 L30.1832191,14.8723018 C29.9924366,14.9574339 29.7863915,15 29.5803465,15 Z" id="形状"></path>
+                    <path d="M29.440349,15 C29.0097855,15 28.5948789,14.778309 28.3639403,14.385488 C28.0234038,13.7943119 28.2230287,13.0436738 28.8179891,12.701414 L33.1392805,10.2200301 C33.7303267,9.87777027 34.4896841,10.083904 34.8341349,10.6711908 C35.1746714,11.2623669 34.9750466,12.013005 34.3800861,12.3552648 L30.0587947,14.8366487 C29.863084,14.9455496 29.6517165,15 29.440349,15 Z M24.2383596,9.75720146 C24.026992,9.75720146 23.8156245,9.70275103 23.6199139,9.59385017 C23.0249534,9.25159032 22.8253286,8.50095225 23.1658651,7.90977615 L25.659219,3.61597082 C26.0036697,3.02479472 26.7591129,2.82643958 27.3540733,3.16481011 C27.9490337,3.50706996 28.1486586,4.25770803 27.8081221,4.84888412 L25.310854,9.14268946 C25.0838296,9.53939974 24.6650088,9.75720146 24.2383596,9.75720146 L24.2383596,9.75720146 Z" id="形状"></path>
+                    <path d="M24.9958687,9 C24.8258904,9 24.655912,8.9516512 24.4985247,8.8549536 C24.0200672,8.55104686 23.8595321,7.88452412 24.133386,7.3595943 L26.1385009,3.54694609 C26.4155026,3.02201626 27.0230178,2.84588849 27.5014753,3.14634175 C27.9799328,3.45024849 28.1404679,4.11677123 27.866614,4.64170105 L25.8583514,8.45434926 C25.6757821,8.8066048 25.3389731,9 24.9958687,9 L24.9958687,9 Z" id="路径"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

Fișier diff suprimat deoarece este prea mare
+ 0 - 2
public/imgs/index_alarm.svg


+ 0 - 7
public/imgs/index_device.svg

@@ -1,7 +0,0 @@
-<svg width="128" height="128" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path id="-" fill="#0079fe" stroke="none" opacity="0.1" d="M 0 64 C 0 86.864998 12.198331 107.993126 32 119.425629 C 51.80167 130.858124 76.198334 130.858124 96 119.425629 C 115.801666 107.993126 128 86.864998 128 64 C 128 41.135002 115.801666 20.006874 96 8.574371 C 76.198334 -2.858124 51.80167 -2.858124 32 8.574371 C 12.198331 20.006874 0 41.135002 0 64 Z"/>
-    <path id="path1" fill="#d5d5d5" stroke="none" d="M 65 42.818123 C 69.984818 42.818123 74.346535 45.524727 76.371613 49.51342 C 76.838943 50.51059 77.929367 51.222855 79.175575 51.222855 C 81.35643 51.222855 82.914192 49.08606 81.97953 47.234169 C 79.019798 41.251137 72.477226 37.119995 65 37.119995 C 57.367001 37.119995 50.824425 41.251137 48.020466 47.234169 C 47.085812 49.08606 48.643566 51.222855 50.824425 51.222855 C 52.070629 51.222855 53.161057 50.51059 53.628384 49.51342 C 55.653469 45.524727 60.015182 42.818123 65 42.818123 Z"/>
-    <path id="path2" fill="#d5d5d5" stroke="none" d="M 63.983822 31.868233 C 75.460831 31.868233 85.108177 39.098831 87.60318 48.690422 C 87.935852 50.018486 89.266518 51.05143 90.763519 51.05143 C 92.925858 51.05143 94.422859 49.280678 93.923851 47.509918 C 90.929855 35.262184 78.62117 25.965714 63.817486 25.965714 C 49.013805 25.965714 36.705124 35.262184 33.711117 47.509918 C 33.212116 49.280678 34.875454 51.05143 36.871456 51.05143 C 38.368458 51.05143 39.699123 50.018486 40.031792 48.690422 C 42.859463 39.098831 52.506809 31.868233 63.983822 31.868233 Z"/>
-    <path id="path3" fill="#0079fe" stroke="none" d="M 88.779251 63.829224 C 87.807663 63.147697 86.697296 62.738777 85.44812 62.738777 L 67.40451 62.738777 L 67.40451 54.56041 C 67.40451 54.287796 67.40451 54.015182 67.265717 53.742577 C 66.849319 52.652122 65.877747 51.83429 64.628571 51.83429 C 63.379398 51.83429 62.407822 52.652122 61.991428 53.742577 C 61.852631 54.015182 61.852631 54.287796 61.852631 54.56041 L 61.852631 62.738777 L 43.809025 62.738777 C 42.421055 62.738777 41.171879 63.283997 40.200302 64.101837 C 39.089924 65.055977 38.257141 66.555344 38.257141 68.191025 L 38.257141 84.54776 C 38.257141 87.546494 40.755489 90 43.809025 90 L 85.44812 90 C 88.501656 90 91 87.546494 91 84.54776 L 91 68.191025 C 91 66.419037 90.167213 64.919678 88.779251 63.829224 Z M 47.972935 79.095512 C 46.446167 79.095512 45.196995 77.868759 45.196995 76.369385 C 45.196995 74.870026 46.446167 73.643265 47.972935 73.643265 C 49.499699 73.643265 50.748871 74.870026 50.748871 76.369385 C 50.748871 77.868759 49.499699 79.095512 47.972935 79.095512 Z M 56.300751 79.095512 C 54.773983 79.095512 53.524811 77.868759 53.524811 76.369385 C 53.524811 74.870026 54.773983 73.643265 56.300751 73.643265 C 57.827518 73.643265 59.076691 74.870026 59.076691 76.369385 C 59.076691 77.868759 57.827518 79.095512 56.300751 79.095512 Z"/>
-    <image id="image1" x="61" y="66" width="28" height="22" xlink:href="data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABwAAAAWCAYAAADTlvzyAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAHKADAAQAAAABAAAAFgAAAAAuDewDAAACeElEQVRIDbVWMWsUQRT+Zi67UQ/FPY+ggiCmURDxD1hZmF9gESysLOwkp6jVWQgKWtkI9iKIjcbeysIqRERQURBFENnzFHPJbW6e35vZ3buExOK8HZidN2/mfd/Mm5n31mC0XJAI+zALwWEYTJVDlj1BnfUg4A5RnwCmznYPq7Y7WS2rFuHsPxD5BLHPKD3FPbMWhmhVCGjJDCJ3iapz1M2w1sqxIOjcom4a2ra7Sv4nmLYX0Ta/dFbYxVWZg5EW8U79WEjjNE2RZdm2KP8aiKIIjUYDzWYzbOaaW8cq3tPmhtpZXJcTJLtD+TRr3Ol0xiZTQF2oYoyUGvHn0RZ1v/f7GbbHign9fr8Qx263wDiANT1/JXTuqG89fPCCFyf7iXj6sULq/dsVsElWGZ9HdjmhoY892RIVzwN5BV/BuqJO8b0MYM0CIjzKab5WQGeGLhW8GiGrgMtD8q5gv0oWNflQFcsILo8NxwOhYyjK8qiS9aq6NsR1JwOhqX2hcJvvZO/IiiYvipkNhDE+c49zjHnLcDveTp4pRzQM9G2xFm/QparLp6HPY3dlhECfXMbisRnwaYTgJxXSQd4pV5HzuiStkm0F1j5UgjxpMlnmJY59yCu6Y7WbMPrczAPcxKKCBUKxGtJ6qkiSBJrTxi1qqxhlMeYKUnuZgdq7MLy7ltSZ7e9SeZ4Tp8vJWwtqqIFYfxs0l+nqil8MHevx1i/xAt5nu4hbZkNyHD70tsQ0n4eTszQ6wsigWUQD7goNeYvxk675Tqd8ZH+Z/dek/Ea6hGGDOVXTnP3Npbwg/Uv+UvjsQPsNZUhYqsWg7SOPuttRHhTuKKf8h/AXljmxAjmdsToAAAAASUVORK5CYII="/>
-</svg>

+ 0 - 1
public/imgs/index_product.svg

@@ -1 +0,0 @@
-<svg t="1694787151855" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="43848" width="128" height="128"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#0079FE" opacity=".1" p-id="43849"></path><path d="M512 352.5632a155.9552 155.9552 0 1 0 155.9552 155.9552A156.16 156.16 0 0 0 512 352.5632m0-40.0384a195.9936 195.9936 0 1 1-195.9936 195.9936A195.9936 195.9936 0 0 1 512 312.5248z m0 0" fill="#0079FE" p-id="43850"></path><path d="M512 422.5024a74.9568 74.9568 0 1 1 74.9568-74.9568A75.0592 75.0592 0 0 1 512 422.5024z m0 0" fill="#FFFFFF" p-id="43851"></path><path d="M512 292.5568a54.9888 54.9888 0 1 0 54.9888 54.9888A55.0912 55.0912 0 0 0 512 292.5568m0-40.0384a95.0272 95.0272 0 1 1-95.0272 95.0272A95.0272 95.0272 0 0 1 512 252.5184z m0 0" fill="#0079FE" p-id="43852"></path><path d="M672.9728 710.5536A74.9568 74.9568 0 1 1 747.52 635.4944a75.0592 75.0592 0 0 1-74.9568 74.9568z m0 0" fill="#FFFFFF" p-id="43853"></path><path d="M672.9728 580.5056a54.9888 54.9888 0 1 0 54.9888 54.9888 55.0912 55.0912 0 0 0-54.9888-54.9888m0-40.0384a95.0272 95.0272 0 1 1-95.0272 95.0272 95.0272 95.0272 0 0 1 95.0272-95.0272z m0 0" fill="#0079FE" p-id="43854"></path><path d="M351.0272 710.5536a74.9568 74.9568 0 1 1 74.9568-74.9568 75.0592 75.0592 0 0 1-74.9568 74.9568z m0 0" fill="#FFFFFF" p-id="43855"></path><path d="M351.0272 580.5056a54.9888 54.9888 0 1 0 54.9888 54.9888 55.0912 55.0912 0 0 0-54.9888-54.9888m0-40.0384A95.0272 95.0272 0 1 1 256 635.4944a95.0272 95.0272 0 0 1 95.0272-95.0272z m0 0" fill="#0079FE" p-id="43856"></path></svg>

+ 0 - 4
public/imgs/index_sensor.svg

@@ -1,4 +0,0 @@
-<svg width="128" height="128" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path id="-" fill="#0079fe" stroke="none" opacity="0.1" d="M 0 64 C 0 86.864998 12.198331 107.993126 32 119.425629 C 51.80167 130.858124 76.198334 130.858124 96 119.425629 C 115.801666 107.993126 128 86.864998 128 64 C 128 41.135002 115.801666 20.006874 96 8.574371 C 76.198334 -2.858124 51.80167 -2.858124 32 8.574371 C 12.198331 20.006874 0 41.135002 0 64 Z"/>
-    <path id="path1" fill="#63a1ff" stroke="none" d="M 89.604164 90.306168 L 67.682831 90.306168 L 60.758957 98.136559 C 59.812168 99.207268 58.191841 99.294067 57.139854 98.330429 C 56.087868 97.366791 56.002586 95.717628 56.949375 94.646919 L 64.636871 85.953247 C 65.122871 85.403687 65.815208 85.089905 66.541664 85.089966 L 89.604164 85.089966 C 91.962883 85.089966 93.875 83.143814 93.875 80.743134 L 93.875 44.229706 C 93.875 41.829018 91.962883 39.882866 89.604164 39.882866 L 40.0625 39.882866 C 37.703785 39.882866 35.791668 41.829018 35.791668 44.229706 L 35.791668 80.743134 C 35.791668 83.143814 37.703785 85.089966 40.0625 85.089966 L 51.166668 85.089966 C 52.581894 85.089966 53.729168 86.257652 53.729168 87.698067 C 53.729168 89.138481 52.581894 90.306168 51.166668 90.306168 L 40.0625 90.306168 C 34.873436 90.306168 30.666666 86.024536 30.666666 80.743134 L 30.666666 44.229706 C 30.666666 38.948303 34.873436 34.666664 40.0625 34.666664 L 89.604164 34.666664 C 94.793228 34.666664 99 38.948303 99 44.229706 L 99 80.743134 C 99 86.024536 94.793228 90.306168 89.604164 90.306168 Z M 80.208336 52.923378 C 81.623558 52.923378 82.770836 54.091064 82.770836 55.531479 C 82.770836 56.971893 81.623558 58.139587 80.208336 58.139587 L 49.458332 58.139587 C 48.043102 58.139587 46.895832 56.971893 46.895832 55.531479 C 46.895832 54.091064 48.043102 52.923378 49.458332 52.923378 L 80.208336 52.923378 Z M 64.833336 66.833252 C 66.248558 66.833252 67.395836 68.000946 67.395836 69.441353 C 67.395836 70.881767 66.248558 72.049454 64.833336 72.049454 L 49.458332 72.049454 C 48.043102 72.049454 46.895832 70.881767 46.895832 69.441353 C 46.895832 68.000946 48.043102 66.833252 49.458332 66.833252 L 64.833336 66.833252 Z"/>
-</svg>

Fișier diff suprimat deoarece este prea mare
+ 6 - 0
src/assets/date.svg


+ 11 - 0
src/assets/ok.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>dui</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="用户管理-企业审核备份-7" transform="translate(-408, -235)" fill="#51B465" fill-rule="nonzero">
+            <g id="dui" transform="translate(408, 235)">
+                <path d="M8.5,0 C3.80563889,0 0,3.80563889 0,8.5 C0,13.1943611 3.80563889,17 8.5,17 C13.1943611,17 17,13.1943611 17,8.5 C17,3.80563889 13.1943611,0 8.5,0 Z M6.79480555,11.9476944 L3.71213889,8.91909721 L4.25661111,8.12175 L6.79480555,9.95161111 L12.7566111,5.05230555 L13.2878611,5.4655 L6.79480555,11.9476944 L6.79480555,11.9476944 Z" id="形状"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/stop.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 2</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="用户管理-企业审核备份-7" transform="translate(-537, -235)">
+            <g id="编组-2" transform="translate(537, 235)">
+                <circle id="椭圆形备份-22" fill="#FFBB73" cx="8.5" cy="8.5" r="8.5"></circle>
+                <line x1="4.5" y1="5.5" x2="12.5" y2="11.5" id="直线-6" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>

+ 11 - 0
src/assets/today.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>shijian</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="用户管理-企业审核备份-7" transform="translate(-1365, -235)" fill="#2441F9" fill-rule="nonzero">
+            <g id="shijian" transform="translate(1365, 235)">
+                <path d="M8.5,17 C13.1943375,17 17,13.1943375 17,8.5 C17,3.80566249 13.1943375,0 8.5,0 C3.80566251,0 0,3.80566251 0,8.5 C0,13.1943375 3.80566249,17 8.5,17 Z M4.8617875,11.2367875 L7.8625,8.23586249 L7.8625,4.675 C7.8625,4.32291848 8.14791847,4.0375 8.5,4.0375 C8.85208153,4.0375 9.1375,4.32291848 9.1375,4.675 L9.1375,8.5 C9.1375,8.66906169 9.07027523,8.83118588 8.9507125,8.9507125 L5.7632125,12.1382125 C5.60315253,12.3039348 5.36612785,12.370398 5.14323908,12.3120569 C4.92035032,12.2537158 4.74628416,12.0796497 4.68794307,11.8567609 C4.62960197,11.6338722 4.69606518,11.3968475 4.8617875,11.2367875 L4.8617875,11.2367875 Z" id="形状"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 113 - 41
src/views/iot/iotmanager/dashboard.vue

@@ -2,22 +2,28 @@
 	<div class="home-container">
 		<el-row :gutter="15" class="home-card-one mb15">
 			<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-for="(v, k) in homeOne" :key="k" :class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }">
-				<div class="home-card-item ">
-					<div>{{ v.num3 }}</div>
-					<div class="flex-margin flex w100" :class="` home-one-animation${k}`">
-						<div class="flex-auto">
+				<div class="home-card-top-part">
+					<div class="top">
+						<img :src="'/imgs/' + v.icoimg" class="icoimg">
+						<div class="card-right">
 							<span class="font30">{{ v.allnum }}</span>
-						</div>
-						<div class="home-card-item-icon flex">
-							<img :src="'/imgs/' + v.icoimg" class="icoimg">
+							<div class="label">{{ v.num3 }}</div>
 						</div>
 					</div>
-					<div class="flex" style="font-weight: bold;">
-						<div class="flex font14">
-							<div class="title_status" :style="{ backgroundColor: v.title1_bgcolor }"></div> {{ v.title1 }} {{ v.num1 }}
+					<div class="divider"></div>
+					<div class="card-bottom">
+						<div class="flex" style="gap:10px">
+							<img src="/@/assets/ok.svg" v-if="k < 2" alt="" class="icon">
+							<img src="/@/assets/date.svg" v-else alt="" class="icon">
+							<span class="info" :style="{ color: v.title1_bgcolor }">{{ v.title1 }}</span>
+							<div class="num"> {{ v.num1 }}</div>
 						</div>
-						<div class="flex ml20 font14">
-							<div class="title_status" :style="{ backgroundColor: v.title2_bgcolor }"></div>{{ v.title2 }} {{ v.num2 }}
+						<div class="split"></div>
+						<div class="flex" style="gap:10px">
+							<img src="/@/assets/stop.svg" v-if="k < 2" alt="" class="icon">
+							<img src="/@/assets/today.svg" v-else alt="" class="icon">
+							<span class="info" :style="{ color: v.title2_bgcolor }">{{ v.title2 }}</span>
+							<div class="num"> {{ v.num2 }}</div>
 						</div>
 					</div>
 				</div>
@@ -155,11 +161,11 @@ export default defineComponent({
 					color1: '#6690F9',
 					color2: '--el-color-warning-lighter',
 					color3: '--el-color-warning',
-					icoimg: 'index_product.svg',
+					icoimg: 'dashboard-icon1.svg',
 					title1: '启用',
 					title2: '停用',
 					title1_bgcolor: '#3cd357',
-					title2_bgcolor: '#c1bbbb',
+					title2_bgcolor: '#FFBB73',
 
 				},
 				{
@@ -171,11 +177,11 @@ export default defineComponent({
 					color1: '#FF6462',
 					color2: '--next-color-primary-lighter',
 					color3: '--el-color-primary',
-					icoimg: 'index_device.svg',
+					icoimg: 'dashboard-icon2.svg',
 					title1: '启用',
 					title2: '停用',
 					title1_bgcolor: '#3cd357',
-					title2_bgcolor: '#c1bbbb',
+					title2_bgcolor: '#FFBB73',
 				},
 				{
 					allnum: 0,
@@ -186,11 +192,11 @@ export default defineComponent({
 					color1: '#6690F9',
 					color2: '--el-color-success-lighter',
 					color3: '--el-color-success',
-					icoimg: 'index_sensor.svg',
+					icoimg: 'dashboard-icon3.svg',
 					title1: '本月',
 					title2: '今日',
-					title1_bgcolor: '#c1bbbb',
-					title2_bgcolor: '#18f3ff',
+					title1_bgcolor: '#5ECCFF',
+					title2_bgcolor: '#2441F9',
 				},
 				{
 					allnum: 0,
@@ -201,11 +207,11 @@ export default defineComponent({
 					color1: '#6690F9',
 					color2: '--el-color-warning-lighter',
 					color3: '--el-color-warning',
-					icoimg: 'index_alarm.svg',
+					icoimg: 'dashboard-icon4.svg',
 					title1: '本月',
 					title2: '今日',
-					title1_bgcolor: '#c1bbbb',
-					title2_bgcolor: '#ff1818',
+					title1_bgcolor: '#5ECCFF',
+					title2_bgcolor: '#2441F9',
 				},
 			],
 			myCharts: [],
@@ -260,16 +266,16 @@ export default defineComponent({
 					{
 						name: '消息量',
 						type: 'line',
-						symbolSize: 6,
+						symbolSize: 0,
 						symbol: 'circle',
 						smooth: true,
 						data: state.lineChartMsgTotalData,
-						lineStyle: { color: '#fe9a8b' },
-						itemStyle: { color: '#fe9a8b', borderColor: '#fe9a8b' },
+						lineStyle: { color: '#6AE4F8', width: 3 },
+						itemStyle: { color: '#6AE4F8', borderColor: '#6AE4F8' },
 						areaStyle: {
 							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-								{ offset: 0, color: '#fe9a8bb3' },
-								{ offset: 1, color: '#fe9a8b03' },
+								{ offset: 0, color: 'rgba(106, 228, 248, 0.3)' },
+								{ offset: 1, color: 'rgba(106, 228, 248, 0)' },
 							]),
 						},
 					},
@@ -280,12 +286,12 @@ export default defineComponent({
 						symbol: 'circle',
 						smooth: true,
 						data: state.lineChartAlarmTotalData,
-						lineStyle: { color: '#9E87FF' },
-						itemStyle: { color: '#9E87FF', borderColor: '#9E87FF' },
+						lineStyle: { color: '#3880F0', width: 3 },
+						itemStyle: { color: '#3880F0', borderColor: '#3880F0' },
 						areaStyle: {
 							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-								{ offset: 0, color: '#9E87FFb3' },
-								{ offset: 1, color: '#9E87FF03' },
+								{ offset: 0, color: 'rgba(56, 128, 240, 0.3)' },
+								{ offset: 1, color: 'rgba(56, 128, 240, 0)' },
 							]),
 						},
 						emphasis: {
@@ -384,12 +390,7 @@ export default defineComponent({
 						type: 'pie',
 						radius: ['70', '90'],
 						center: ['32%', '50%'],
-						itemStyle: {
-							// color: function (params: any) {
-							// 	console.log(params)
-							// 	return colorList[params.dataIndex];
-							// },
-						},
+						padAngle: 1,
 						label: { show: false },
 						labelLine: { show: false },
 						data: data,
@@ -619,6 +620,77 @@ export default defineComponent({
 <style scoped lang="scss">
 $homeNavLengh: 8;
 
+.home-card-top-part {
+	background-color: var(--el-color-white);
+	border-radius: 8px;
+	padding: 20px 20px;
+
+	.top {
+		display: flex;
+		justify-content: space-around;
+		overflow: hidden;
+		align-items: center;
+	}
+
+	.icoimg {
+		width: 54px !important;
+		height: 54px !important;
+		margin-right: 12px;
+	}
+
+	.label {
+		font-size: 14px;
+		font-weight: 500;
+	}
+
+	.divider {
+		border-top: 1px solid var(--el-border-color-light);
+		margin: 12px 0 15px;
+
+	}
+
+	.card-right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		white-space: nowrap;
+		line-height: 1;
+		height: 54px;
+
+		.font30 {
+			color: #343EED;
+			font-weight: bold;
+			font-size: 30px;
+		}
+
+	}
+
+	.card-bottom {
+		font-size: 12px;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		gap: 12px;
+
+		.split {
+			border-right: 1px solid var(--el-border-color-light);
+			height: 20px;
+		}
+
+		.icon {
+			width: 17px;
+			height: 17px;
+
+		}
+
+		.info {
+			font-size: 12px;
+			font-weight: 500;
+		}
+	}
+}
+
 .home-container {
 	overflow: hidden;
 
@@ -626,8 +698,8 @@ $homeNavLengh: 8;
 	.home-card-two,
 	.home-card-three {
 		.icoimg {
-			width: 50px;
-			height: 50px;
+			width: 75px;
+			height: 75px;
 		}
 
 		.title_status {
@@ -642,14 +714,14 @@ $homeNavLengh: 8;
 		.home-card-top {
 			width: 100%;
 			height: 130px;
-			border-radius: 4px;
+			border-radius: 8px;
 			transition: all ease 0.3s;
 			padding: 10px 20px;
 			overflow: hidden;
 			background: var(--el-color-white);
 			color: var(--el-text-color-primary);
-			border: 1px solid var(--next-border-color-light);
 
+			// border: 1px solid var(--next-border-color-light);
 			&:hover {
 				// box-shadow: 0 2px 12px var(--next-color-dark-hover);
 				transition: all ease 0.3s;

+ 13 - 6
yarn.lock

@@ -1274,13 +1274,13 @@ echarts-wordcloud@^2.0.0:
   resolved "https://registry.npmmirror.com/echarts-wordcloud/-/echarts-wordcloud-2.0.0.tgz"
   integrity sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==
 
-echarts@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.npmmirror.com/echarts/-/echarts-5.3.3.tgz"
-  integrity sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==
+echarts@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.npmmirror.com/echarts/-/echarts-5.5.0.tgz#c13945a7f3acdd67c134d8a9ac67e917830113ac"
+  integrity sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==
   dependencies:
     tslib "2.3.0"
-    zrender "5.3.2"
+    zrender "5.5.0"
 
 element-plus@2.2.28:
   version "2.2.28"
@@ -3150,7 +3150,14 @@ yocto-queue@^0.1.0:
   resolved "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-zrender@5.3.2, zrender@^5.1.1:
+zrender@5.5.0:
+  version "5.5.0"
+  resolved "https://registry.npmmirror.com/zrender/-/zrender-5.5.0.tgz#54d0d6c4eda81a96d9f60a9cd74dc48ea026bc1e"
+  integrity sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==
+  dependencies:
+    tslib "2.3.0"
+
+zrender@^5.1.1:
   version "5.3.2"
   resolved "https://registry.npmmirror.com/zrender/-/zrender-5.3.2.tgz"
   integrity sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff