Merge remote-tracking branch 'origin/master'

haiwei-admin/src/main/resources/static/board/board2.css

@@ -94,7 +94,7 @@ body {
     font-size: 0.8vw;
 }
 
-.bottom{
+.bottom {
     position: absolute;
     width: 91.5%;
     height: 25%;
@@ -103,7 +103,7 @@ body {
     overflow: auto;
 }
 
-.bottom .item{
+.bottom .item {
     background-image: url("../../board/img/bottomImg.png");
     background-size: 100% 100%;
     background-repeat: no-repeat;
@@ -114,7 +114,7 @@ body {
     background-position: 0 1vw;
 }
 
-.bottom .item .title{
+.bottom .item .title {
     position: absolute;
     top: 1%;
     left: 9%;
@@ -122,10 +122,11 @@ body {
     color: #ddd;
 }
 
-.bottom .item .img{
+.bottom .item .img {
     position: absolute;
     top: 63%;
     left: 50%;
     width: 90%;
-    transform: translate(-50%,-50%);
+    height: 70%;
+    transform: translate(-50%, -50%);
 }

haiwei-admin/src/main/resources/static/board/board2.js

@@ -23,6 +23,7 @@ $(() => {
       return {
         name: val.deviceTypeName,
         img: val.deviceTypePath,
+        // img: '../../board/img/equipment.png',
         url:val.deviceTypeUrl
       }
     })